Backed out 6 changesets (bug 914826) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 13 Sep 2013 16:32:42 -0400
changeset 160069 e16e1dae3315de70f3d42fbcff7db0789748d975
parent 160068 a4a029c13179412562f4b770a200d069662bc394
child 160070 da5496557024272d121e9e61d68bc5875bc5e142
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs914826
milestone26.0a1
backs outa4a029c13179412562f4b770a200d069662bc394
d16460fc05182bc4e4ac0f65211c3e5b9feb1b9f
b28cb0ae1853e4ebca6edacb6c1d8e65da117c38
5b4ce1d4d09baabd2db6fc4da4a71cdadfbf6c21
58d96448609a9478904a17734e99b037facf60db
52b319afe96567de56f105171546120ebf51a578
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 6 changesets (bug 914826) for bustage. Backed out changeset a4a029c13179 (bug 914826) Backed out changeset d16460fc0518 (bug 914826) Backed out changeset b28cb0ae1853 (bug 914826) Backed out changeset 5b4ce1d4d09b (bug 914826) Backed out changeset 58d96448609a (bug 914826) Backed out changeset 52b319afe965 (bug 914826)
dom/base/nsContentPermissionHelper.cpp
dom/base/nsDOMWindowUtils.cpp
dom/bluetooth/BluetoothReplyRunnable.cpp
dom/mobilemessage/src/gonk/SmsService.cpp
dom/plugins/ipc/PluginModuleParent.cpp
dom/system/gonk/AudioManager.cpp
dom/telephony/ipc/TelephonyParent.cpp
hal/android/AndroidHal.cpp
hal/cocoa/CocoaSensor.mm
hal/fallback/FallbackAlarm.cpp
hal/fallback/FallbackScreenConfiguration.cpp
hal/windows/WindowsBattery.cpp
ipc/ipdl/ipdl.py
ipc/ipdl/ipdl/builtin.py
ipc/ipdl/ipdl/lower.py
ipc/ipdl/ipdl/type.py
layout/generic/nsSubDocumentFrame.cpp
widget/gonk/OrientationObserver.cpp
widget/gonk/OrientationObserver.h
--- a/dom/base/nsContentPermissionHelper.cpp
+++ b/dom/base/nsContentPermissionHelper.cpp
@@ -4,17 +4,16 @@
 
 #include "nsContentPermissionHelper.h"
 #include "nsIContentPermissionPrompt.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMElement.h"
 #include "nsIPrincipal.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/unused.h"
-#include "nsComponentManagerUtils.h"
 
 using mozilla::unused;          // <snicker>
 using namespace mozilla::dom;
 
 nsContentPermissionRequestProxy::nsContentPermissionRequestProxy()
 {
   MOZ_COUNT_CTOR(nsContentPermissionRequestProxy);
 }
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -73,17 +73,16 @@
 #include "nsIAppShell.h"
 #include "nsWidgetsCID.h"
 #include "FrameLayerBuilder.h"
 #include "nsDisplayList.h"
 #include "nsROCSSPrimitiveValue.h"
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #undef GetClassName
 #endif
 
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;
--- a/dom/bluetooth/BluetoothReplyRunnable.cpp
+++ b/dom/bluetooth/BluetoothReplyRunnable.cpp
@@ -3,17 +3,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "base/basictypes.h"
 #include "BluetoothReplyRunnable.h"
 #include "DOMRequest.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
-#include "nsServiceManagerUtils.h"
 
 USING_BLUETOOTH_NAMESPACE
 
 BluetoothReplyRunnable::BluetoothReplyRunnable(nsIDOMDOMRequest* aReq)
   : mDOMRequest(aReq)
 {}
 
 void
--- a/dom/mobilemessage/src/gonk/SmsService.cpp
+++ b/dom/mobilemessage/src/gonk/SmsService.cpp
@@ -2,17 +2,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "SmsMessage.h"
 #include "SmsService.h"
 #include "jsapi.h"
 #include "SmsSegmentInfo.h"
-#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace dom {
 namespace mobilemessage {
 
 NS_IMPL_ISUPPORTS1(SmsService, nsISmsService)
 
 SmsService::SmsService()
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -25,17 +25,16 @@
 #include "nsAutoPtr.h"
 #include "nsCRT.h"
 #include "nsIFile.h"
 #include "nsIObserverService.h"
 #include "nsNPAPIPlugin.h"
 #include "nsPrintfCString.h"
 #include "PluginIdentifierParent.h"
 #include "prsystem.h"
-#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #include "PluginHangUIParent.h"
 #include "mozilla/widget/AudioSession.h"
 #endif
 
 #ifdef MOZ_ENABLE_PROFILER_SPS
 #include "nsIProfileSaveEvent.h"
--- a/dom/system/gonk/AudioManager.cpp
+++ b/dom/system/gonk/AudioManager.cpp
@@ -28,18 +28,16 @@
 
 #include "BluetoothCommon.h"
 #include "BluetoothProfileManagerBase.h"
 #include "BluetoothHfpManager.h"
 
 #include "nsJSUtils.h"
 #include "nsCxPusher.h"
 #include "nsThreadUtils.h"
-#include "nsServiceManagerUtils.h"
-#include "nsComponentManagerUtils.h"
 
 using namespace mozilla::dom::gonk;
 using namespace android;
 using namespace mozilla::hal;
 using namespace mozilla;
 using namespace mozilla::dom::bluetooth;
 
 #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "AudioManager" , ## args)
--- a/dom/telephony/ipc/TelephonyParent.cpp
+++ b/dom/telephony/ipc/TelephonyParent.cpp
@@ -1,15 +1,14 @@
 /* -*- Mode: C++ tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/telephony/TelephonyParent.h"
-#include "nsServiceManagerUtils.h"
 
 USING_TELEPHONY_NAMESPACE
 
 /*******************************************************************************
  * TelephonyParent
  ******************************************************************************/
 
 NS_IMPL_ISUPPORTS1(TelephonyParent, nsITelephonyListener)
--- a/hal/android/AndroidHal.cpp
+++ b/hal/android/AndroidHal.cpp
@@ -5,17 +5,16 @@
 
 #include "Hal.h"
 #include "HalImpl.h"
 #include "WindowIdentifier.h"
 #include "AndroidBridge.h"
 #include "mozilla/dom/network/Constants.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "nsIScreenManager.h"
-#include "nsServiceManagerUtils.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::hal;
 
 namespace mozilla {
 namespace hal_impl {
 
 void
--- a/hal/cocoa/CocoaSensor.mm
+++ b/hal/cocoa/CocoaSensor.mm
@@ -1,15 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "Hal.h"
 #include "nsITimer.h"
 #include "smslib.h"
-#include "nsComponentManagerUtils.h"
 
 #include <mach/mach.h>
 #include <cmath>
 #import <IOKit/IOKitLib.h>
 
 #define MEAN_GRAVITY 9.80665
 #define DEFAULT_SENSOR_POLL 100
 using namespace mozilla::hal;
--- a/hal/fallback/FallbackAlarm.cpp
+++ b/hal/fallback/FallbackAlarm.cpp
@@ -1,20 +1,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
 
 #include <algorithm>
 
+#include <nsITimer.h>
+
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
-#include "nsComponentManagerUtils.h"
-#include "nsITimer.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace hal_impl {
 
 static void
 TimerCallbackFunc(nsITimer *aTimer, void *aClosure)
 {
--- a/hal/fallback/FallbackScreenConfiguration.cpp
+++ b/hal/fallback/FallbackScreenConfiguration.cpp
@@ -1,16 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "nsIScreenManager.h"
-#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace hal_impl {
 
 void
 EnableScreenConfigurationNotifications()
 {
 }
--- a/hal/windows/WindowsBattery.cpp
+++ b/hal/windows/WindowsBattery.cpp
@@ -3,17 +3,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
 #include "HalImpl.h"
 #include "nsITimer.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/battery/Constants.h"
-#include "nsComponentManagerUtils.h"
 
 #include <windows.h>
 #include "nsWindowsHelpers.h"
 
 using namespace mozilla::dom::battery;
 
 namespace mozilla {
 namespace hal_impl {
--- a/ipc/ipdl/ipdl.py
+++ b/ipc/ipdl/ipdl.py
@@ -159,14 +159,14 @@ enum IPCMessageStart {
 for name in allprotocols:
     print >>ipcmsgstart, "  %s," % name
     print >>ipcmsgstart, "  %sChild," % name
 
 print >>ipcmsgstart, """
   LastMsgIndex
 };
 
-static_assert(LastMsgIndex <= 65536, "need to update IPC_MESSAGE_MACRO");
+COMPILE_ASSERT(LastMsgIndex <= 65536, need_to_update_IPC_MESSAGE_MACRO);
 
 #endif // ifndef IPCMessageStart_h
 """
 
 ipdl.writeifmodified(ipcmsgstart.getvalue(), ipcmessagestartpath)
--- a/ipc/ipdl/ipdl/builtin.py
+++ b/ipc/ipdl/ipdl/builtin.py
@@ -36,23 +36,22 @@ Types = (
     'nsresult',
     'nsString',
     'nsCString',
     'mozilla::ipc::Shmem',
     'mozilla::ipc::FileDescriptor'
 )
 
 
-HeaderIncludes = (
+Includes = (
     'mozilla/Attributes.h',
+    'base/basictypes.h',
     'prtime.h',
+    'nscore.h',
     'IPCMessageStart.h',
     'ipc/IPCMessageUtils.h',
     'nsAutoPtr.h',
     'nsStringGlue.h',
     'nsTArray.h',
+    'nsIFile.h',
     'mozilla/ipc/ProtocolUtils.h',
+    'GeckoProfiler.h'
 )
-
-CppIncludes = (
-    'nsIFile.h',
-    'GeckoProfiler.h',
-)
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -1,17 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os, re, sys
 from copy import deepcopy
 
 import ipdl.ast
-import ipdl.builtin
 from ipdl.cxx.ast import *
 from ipdl.type import Actor, ActorType, ProcessGraph, TypeVisitor
 
 # FIXME/cjones: the chromium Message logging code doesn't work on
 # gcc/POSIX, because it wprintf()s across the chromium/mozilla
 # boundary. one side builds with -fshort-wchar, the other doesn't.
 # this code will remain off until the chromium base lib is replaced
 EMIT_LOGGING_CODE = ('win32' == sys.platform)
@@ -2549,28 +2548,23 @@ class _GenerateProtocolActorCode(ipdl.as
              
         if self.protocol.decl.type.isToplevel():
             cf.addthings([
                 CppDirective('ifdef', 'MOZ_CRASHREPORTER'),
                 CppDirective('  include', '"nsXULAppAPI.h"'),
                 CppDirective('endif')
             ])
 
-        cppheaders = [CppDirective('include', '"%s"' % filename)
-                      for filename in ipdl.builtin.CppIncludes]
-
         cf.addthings((
             [ Whitespace.NL ]
             + self.protocolCxxIncludes
             + [ Whitespace.NL ]
             + self.standardTypedefs()
             + tu.protocol.decl.cxxtypedefs
             + self.includedActorUsings
-            + [ Whitespace.NL ]
-            + cppheaders
             + [ Whitespace.NL ]))
 
         cppns = makeNamespace(self.protocol, cf)
         cppns.addstmts([
             Whitespace.NL,
             Whitespace.NL,
             clsdefn,
             Whitespace.NL,
@@ -2614,22 +2608,16 @@ class _GenerateProtocolActorCode(ipdl.as
         # FIXME: all actors impl Iface for now
         if ptype.isManager() or 1:
             self.hdrfile.addthing(CppDirective('include', '"base/id_map.h"'))
 
         self.hdrfile.addthings([
             CppDirective('include', '"'+ p.channelHeaderFile() +'"'),
             Whitespace.NL ])
 
-        if ptype.isToplevel() and self.side is 'parent':
-            self.hdrfile.addthings([
-                    _makeForwardDeclForQClass('nsIFile', []),
-                    Whitespace.NL
-                    ])
-
         self.cls = Class(
             self.clsname,
             inherits=[ Inherit(Type(p.fqListenerName()), viz='protected'),
                        Inherit(p.managerInterfaceType(), viz='protected') ],
             abstract=True)
 
         bridgeActorsCreated = ProcessGraph.bridgeEndpointsOf(ptype, self.side)
         opensActorsCreated = ProcessGraph.opensEndpointsOf(ptype, self.side)
--- a/ipc/ipdl/ipdl/type.py
+++ b/ipc/ipdl/ipdl/type.py
@@ -495,17 +495,17 @@ def makeBuiltinUsing(tname):
     quals = tname.split('::')
     base = quals.pop()
     quals = quals[0:]
     return UsingStmt(_builtinloc,
                      TypeSpec(_builtinloc,
                               QualifiedId(_builtinloc, base, quals)))
 
 builtinUsing = [ makeBuiltinUsing(t) for t in builtin.Types ]
-builtinHeaderIncludes = [ CxxInclude(_builtinloc, f) for f in builtin.HeaderIncludes ]
+builtinIncludes = [ CxxInclude(_builtinloc, f) for f in builtin.Includes ]
 
 def errormsg(loc, fmt, *args):
     while not isinstance(loc, Loc):
         if loc is None:  loc = Loc.NONE
         else:            loc = loc.loc
     return '%s: error: %s'% (str(loc), fmt % args)
 
 ##--------------------
@@ -584,17 +584,17 @@ With this information, it finally type c
     def check(self, tu, errout=sys.stderr):
         def runpass(tcheckpass):
             tu.accept(tcheckpass)
             if len(self.errors):
                 self.reportErrors(errout)
                 return False
             return True
 
-        tu.cxxIncludes = builtinHeaderIncludes + tu.cxxIncludes
+        tu.cxxIncludes = builtinIncludes + tu.cxxIncludes
 
         # tag each relevant node with "decl" information, giving type, name,
         # and location of declaration
         if not runpass(GatherDecls(builtinUsing, self.errors)):
             return False
 
         # now that the nodes have decls, type checking is much easier.
         if not runpass(CheckTypes(self.errors)):
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -30,17 +30,16 @@
 #include "nsDisplayList.h"
 #include "nsIScrollableFrame.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsLayoutUtils.h"
 #include "FrameLayerBuilder.h"
 #include "nsObjectFrame.h"
 #include "nsContentUtils.h"
 #include "nsIPermissionManager.h"
-#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using mozilla::layout::RenderFrameParent;
 
 static nsIDocument*
 GetDocumentFromView(nsView* aView)
 {
   NS_PRECONDITION(aView, "");
--- a/widget/gonk/OrientationObserver.cpp
+++ b/widget/gonk/OrientationObserver.cpp
@@ -19,17 +19,16 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Hal.h"
 #include "nsIScreen.h"
 #include "nsIScreenManager.h"
 #include "OrientationObserver.h"
 #include "mozilla/HalSensor.h"
 #include "ProcessOrientation.h"
-#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using namespace dom;
 
 namespace {
 
 struct OrientationMapping {
   uint32_t mScreenRotation;
--- a/widget/gonk/OrientationObserver.h
+++ b/widget/gonk/OrientationObserver.h
@@ -15,17 +15,16 @@
  * limitations under the License.
  */
 
 #ifndef OrientationObserver_h
 #define OrientationObserver_h
 
 #include "mozilla/Observer.h"
 #include "mozilla/dom/ScreenOrientation.h"
-#include "mozilla/Scoped.h"
 
 namespace mozilla {
 class ProcessOrientation;
 namespace hal {
 class SensorData;
 typedef mozilla::Observer<SensorData> ISensorObserver;
 } // namespace hal
 } // namespace mozilla