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)
shellylin · Sep 13, 2013 · 17009bf · 17009bf
1 parent 9da0d7e
commit 17009bf
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 38 deletions.
diff --git a/dom/base/nsContentPermissionHelper.cpp b/dom/base/nsContentPermissionHelper.cpp
@@ -9,7 +9,6 @@
 #include "nsIPrincipal.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/unused.h"
-#include "nsComponentManagerUtils.h"
 
 using mozilla::unused;          // <snicker>
 using namespace mozilla::dom;

diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
@@ -78,7 +78,6 @@
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #undef GetClassName

diff --git a/dom/bluetooth/BluetoothReplyRunnable.cpp b/dom/bluetooth/BluetoothReplyRunnable.cpp
@@ -8,7 +8,6 @@
 #include "BluetoothReplyRunnable.h"
 #include "DOMRequest.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
-#include "nsServiceManagerUtils.h"
 
 USING_BLUETOOTH_NAMESPACE
 

diff --git a/dom/mobilemessage/src/gonk/SmsService.cpp b/dom/mobilemessage/src/gonk/SmsService.cpp
@@ -7,7 +7,6 @@
 #include "SmsService.h"
 #include "jsapi.h"
 #include "SmsSegmentInfo.h"
-#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace dom {

diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -30,7 +30,6 @@
 #include "nsPrintfCString.h"
 #include "PluginIdentifierParent.h"
 #include "prsystem.h"
-#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #include "PluginHangUIParent.h"

diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp
@@ -33,8 +33,6 @@
 #include "nsJSUtils.h"
 #include "nsCxPusher.h"
 #include "nsThreadUtils.h"
-#include "nsServiceManagerUtils.h"
-#include "nsComponentManagerUtils.h"
 
 using namespace mozilla::dom::gonk;
 using namespace android;

diff --git a/dom/telephony/ipc/TelephonyParent.cpp b/dom/telephony/ipc/TelephonyParent.cpp
@@ -4,7 +4,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/telephony/TelephonyParent.h"
-#include "nsServiceManagerUtils.h"
 
 USING_TELEPHONY_NAMESPACE
 

diff --git a/hal/android/AndroidHal.cpp b/hal/android/AndroidHal.cpp
@@ -10,7 +10,6 @@
 #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;

diff --git a/hal/cocoa/CocoaSensor.mm b/hal/cocoa/CocoaSensor.mm
@@ -4,7 +4,6 @@
 #include "Hal.h"
 #include "nsITimer.h"
 #include "smslib.h"
-#include "nsComponentManagerUtils.h"
 
 #include <mach/mach.h>
 #include <cmath>

diff --git a/hal/fallback/FallbackAlarm.cpp b/hal/fallback/FallbackAlarm.cpp
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
+#include <nsITimer.h>
+
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
-#include "nsComponentManagerUtils.h"
-#include "nsITimer.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {

diff --git a/hal/fallback/FallbackScreenConfiguration.cpp b/hal/fallback/FallbackScreenConfiguration.cpp
@@ -5,7 +5,6 @@
 #include "Hal.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "nsIScreenManager.h"
-#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace hal_impl {

diff --git a/hal/windows/WindowsBattery.cpp b/hal/windows/WindowsBattery.cpp
@@ -8,7 +8,6 @@
 #include "nsITimer.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/battery/Constants.h"
-#include "nsComponentManagerUtils.h"
 
 #include <windows.h>
 #include "nsWindowsHelpers.h"

diff --git a/ipc/ipdl/ipdl.py b/ipc/ipdl/ipdl.py
@@ -164,7 +164,7 @@ def normalizedFilename(f):
   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
 """

diff --git a/ipc/ipdl/ipdl/builtin.py b/ipc/ipdl/ipdl/builtin.py
@@ -41,18 +41,17 @@
 )
 
 
-HeaderIncludes = (
+Includes = (
     'mozilla/Attributes.h',
+    'base/basictypes.h',
     'prtime.h',
+    'nscore.h',
     'IPCMessageStart.h',
     'ipc/IPCMessageUtils.h',
     'nsAutoPtr.h',
     'nsStringGlue.h',
     'nsTArray.h',
-    'mozilla/ipc/ProtocolUtils.h',
-)
-
-CppIncludes = (
     'nsIFile.h',
-    'GeckoProfiler.h',
+    'mozilla/ipc/ProtocolUtils.h',
+    'GeckoProfiler.h'
 )
diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
@@ -6,7 +6,6 @@
 from copy import deepcopy
 
 import ipdl.ast
-import ipdl.builtin
 from ipdl.cxx.ast import *
 from ipdl.type import Actor, ActorType, ProcessGraph, TypeVisitor
 
@@ -2554,18 +2553,13 @@ def makeNamespace(p, file):
                 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)
@@ -2619,12 +2613,6 @@ def visitProtocol(self, p):
             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'),

diff --git a/ipc/ipdl/ipdl/type.py b/ipc/ipdl/ipdl/type.py
@@ -500,7 +500,7 @@ def makeBuiltinUsing(tname):
                               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):
@@ -589,7 +589,7 @@ def runpass(tcheckpass):
                 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

diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
@@ -35,7 +35,6 @@
 #include "nsObjectFrame.h"
 #include "nsContentUtils.h"
 #include "nsIPermissionManager.h"
-#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using mozilla::layout::RenderFrameParent;

diff --git a/widget/gonk/OrientationObserver.cpp b/widget/gonk/OrientationObserver.cpp
@@ -24,7 +24,6 @@
 #include "OrientationObserver.h"
 #include "mozilla/HalSensor.h"
 #include "ProcessOrientation.h"
-#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using namespace dom;

diff --git a/widget/gonk/OrientationObserver.h b/widget/gonk/OrientationObserver.h
@@ -20,7 +20,6 @@
 
 #include "mozilla/Observer.h"
 #include "mozilla/dom/ScreenOrientation.h"
-#include "mozilla/Scoped.h"
 
 namespace mozilla {
 class ProcessOrientation;