Backed out 18 changesets (bug 792652) for build bustage on linux64 a=…

…backout CLOSED TREE Backed out changeset 90eaf6aec002 (bug 792652) Backed out changeset ddd915ab4a48 (bug 792652) Backed out changeset 95eff6c45cae (bug 792652) Backed out changeset 75855b5a9ab9 (bug 792652) Backed out changeset b658ebaad5d7 (bug 792652) Backed out changeset 2ba36b8ac60c (bug 792652) Backed out changeset 94fcd3bf3f34 (bug 792652) Backed out changeset cf9c4164eb43 (bug 792652) Backed out changeset 59e6d0a4f35b (bug 792652) Backed out changeset bdf86b8b9c43 (bug 792652) Backed out changeset 8edf4b247250 (bug 792652) Backed out changeset 63a3c8e4016e (bug 792652) Backed out changeset e3e496eab991 (bug 792652) Backed out changeset 5a1e3136323a (bug 792652) Backed out changeset dbbe3a8c00e7 (bug 792652) Backed out changeset 1829d5358808 (bug 792652) Backed out changeset 004cd692ba6d (bug 792652) Backed out changeset 92e7fee81fa2 (bug 792652)
dothq · Nov 8, 2016 · 4b3d166 · 4b3d166
1 parent ae0d5b0
commit 4b3d166
Show file tree

Hide file tree

Showing 36 changed files with 1,186 additions and 676 deletions.
diff --git a/dom/cache/CacheOpParent.cpp b/dom/cache/CacheOpParent.cpp
@@ -54,8 +54,8 @@ CacheOpParent::Execute(ManagerId* aManagerId)
   MOZ_ASSERT(!mManager);
   MOZ_ASSERT(!mVerifier);
 
-  RefPtr<cache::Manager> manager;
-  nsresult rv = cache::Manager::GetOrCreate(aManagerId, getter_AddRefs(manager));
+  RefPtr<Manager> manager;
+  nsresult rv = Manager::GetOrCreate(aManagerId, getter_AddRefs(manager));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     ErrorResult result(rv);
     Unused << Send__delete__(this, result, void_t());
@@ -67,7 +67,7 @@ CacheOpParent::Execute(ManagerId* aManagerId)
 }
 
 void
-CacheOpParent::Execute(cache::Manager* aManager)
+CacheOpParent::Execute(Manager* aManager)
 {
   NS_ASSERT_OWNINGTHREAD(CacheOpParent);
   MOZ_ASSERT(!mManager);

diff --git a/dom/cache/CacheOpParent.h b/dom/cache/CacheOpParent.h
@@ -37,7 +37,7 @@ class CacheOpParent final : public PCacheOpParent
   Execute(ManagerId* aManagerId);
 
   void
-  Execute(cache::Manager* aManager);
+  Execute(Manager* aManager);
 
   void
   WaitForVerification(PrincipalVerifier* aVerifier);
@@ -67,7 +67,7 @@ class CacheOpParent final : public PCacheOpParent
   const CacheId mCacheId;
   const Namespace mNamespace;
   const CacheOpArgs mOpArgs;
-  RefPtr<cache::Manager> mManager;
+  RefPtr<Manager> mManager;
   RefPtr<PrincipalVerifier> mVerifier;
 
   NS_DECL_OWNINGTHREAD

diff --git a/dom/ipc/CrashReporterParent.cpp b/dom/ipc/CrashReporterParent.cpp
@@ -47,6 +47,34 @@ CrashReporterParent::RecvAppendAppNotes(const nsCString& data)
   return true;
 }
 
+mozilla::ipc::IProtocol*
+CrashReporterParent::CloneProtocol(Channel* aChannel,
+                                   mozilla::ipc::ProtocolCloneContext* aCtx)
+{
+#ifdef MOZ_CRASHREPORTER
+  ContentParent* contentParent = aCtx->GetContentParent();
+  CrashReporter::ThreadId childThreadId = contentParent->Pid();
+  GeckoProcessType childProcessType =
+    contentParent->Process()->GetProcessType();
+
+  nsAutoPtr<PCrashReporterParent> actor(
+    contentParent->AllocPCrashReporterParent(childThreadId,
+                                             childProcessType)
+  );
+  if (!actor ||
+      !contentParent->RecvPCrashReporterConstructor(actor,
+                                                    childThreadId,
+                                                    childThreadId)) {
+    return nullptr;
+  }
+
+  return actor.forget();
+#else
+  MOZ_CRASH("Not Implemented");
+  return nullptr;
+#endif
+}
+
 CrashReporterParent::CrashReporterParent()
   :
 #ifdef MOZ_CRASHREPORTER

diff --git a/dom/ipc/CrashReporterParent.h b/dom/ipc/CrashReporterParent.h
@@ -160,6 +160,10 @@ class CrashReporterParent : public PCrashReporterParent
 
   virtual bool RecvAppendAppNotes(const nsCString& aData) override;
 
+  virtual mozilla::ipc::IProtocol*
+  CloneProtocol(Channel* aChannel,
+                mozilla::ipc::ProtocolCloneContext *aCtx) override;
+
 #ifdef MOZ_CRASHREPORTER
   void
   NotifyCrashService();

diff --git a/dom/media/ipc/VideoDecoderManagerChild.cpp b/dom/media/ipc/VideoDecoderManagerChild.cpp
@@ -246,7 +246,7 @@ VideoDecoderManagerChild::DeallocateSurfaceDescriptorGPUVideo(const SurfaceDescr
 }
 
 void
-VideoDecoderManagerChild::HandleFatalError(const char* aName, const char* aMsg) const
+VideoDecoderManagerChild::FatalError(const char* const aName, const char* const aMsg) const
 {
   dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
 }

diff --git a/dom/media/ipc/VideoDecoderManagerChild.h b/dom/media/ipc/VideoDecoderManagerChild.h
@@ -58,7 +58,7 @@ class VideoDecoderManagerChild final : public PVideoDecoderManagerChild
   void ActorDestroy(ActorDestroyReason aWhy) override;
   void DeallocPVideoDecoderManagerChild() override;
 
-  void HandleFatalError(const char* aName, const char* aMsg) const override;
+  void FatalError(const char* const aName, const char* const aMsg) const override;
 
   PVideoDecoderChild* AllocPVideoDecoderChild() override;
   bool DeallocPVideoDecoderChild(PVideoDecoderChild* actor) override;

diff --git a/dom/media/ipc/VideoDecoderManagerParent.h b/dom/media/ipc/VideoDecoderManagerParent.h
@@ -33,7 +33,7 @@ class VideoDecoderManagerParent final : public PVideoDecoderManagerParent
   bool RecvReadback(const SurfaceDescriptorGPUVideo& aSD, SurfaceDescriptor* aResult) override;
   bool RecvDeallocateSurfaceDescriptorGPUVideo(const SurfaceDescriptorGPUVideo& aSD) override;
 
-  void ActorDestroy(mozilla::ipc::IProtocol::ActorDestroyReason) override {}
+  void ActorDestroy(mozilla::ipc::IProtocolManager<mozilla::ipc::IProtocol>::ActorDestroyReason) override {}
 
   void DeallocPVideoDecoderManagerParent() override;
 

diff --git a/dom/media/systemservices/MediaParent.h b/dom/media/systemservices/MediaParent.h
@@ -22,7 +22,7 @@ class OriginKeyStore;
 
 class NonE10s
 {
-  typedef mozilla::ipc::IProtocol::ActorDestroyReason
+  typedef mozilla::ipc::IProtocolManager<mozilla::ipc::IProtocol>::ActorDestroyReason
       ActorDestroyReason;
 public:
   virtual ~NonE10s() {}
@@ -45,7 +45,7 @@ class NonE10s
 template<class Super>
 class Parent : public Super
 {
-  typedef mozilla::ipc::IProtocol::ActorDestroyReason
+  typedef mozilla::ipc::IProtocolManager<mozilla::ipc::IProtocol>::ActorDestroyReason
       ActorDestroyReason;
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Parent<Super>)

diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h
@@ -10,9 +10,8 @@
 #include "ipc/IPCMessageUtils.h"
 #include "base/message_loop.h"
 
-#include "mozilla/ipc/CrossProcessMutex.h"
 #include "mozilla/ipc/MessageChannel.h"
-#include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/ipc/CrossProcessMutex.h"
 #include "mozilla/UniquePtr.h"
 #include "gfxipc/ShadowLayerUtils.h"
 

diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -1036,7 +1036,8 @@ PluginInstanceParent*
 PluginModuleChromeParent::GetManagingInstance(mozilla::ipc::IProtocol* aProtocol)
 {
     MOZ_ASSERT(aProtocol);
-    mozilla::ipc::IProtocol* listener = aProtocol;
+    mozilla::ipc::MessageListener* listener =
+        static_cast<mozilla::ipc::MessageListener*>(aProtocol);
     switch (listener->GetProtocolTypeId()) {
         case PPluginInstanceMsgStart:
             // In this case, aProtocol is the instance itself. Just cast it.

diff --git a/dom/storage/DOMStorageIPC.cpp b/dom/storage/DOMStorageIPC.cpp
@@ -371,6 +371,18 @@ DOMStorageDBParent::~DOMStorageDBParent()
   }
 }
 
+mozilla::ipc::IProtocol*
+DOMStorageDBParent::CloneProtocol(Channel* aChannel,
+                                  mozilla::ipc::ProtocolCloneContext* aCtx)
+{
+  ContentParent* contentParent = aCtx->GetContentParent();
+  nsAutoPtr<PStorageParent> actor(contentParent->AllocPStorageParent());
+  if (!actor || !contentParent->RecvPStorageConstructor(actor)) {
+    return nullptr;
+  }
+  return actor.forget();
+}
+
 DOMStorageDBParent::CacheParentBridge*
 DOMStorageDBParent::NewCache(const nsACString& aOriginSuffix, const nsACString& aOriginNoSuffix)
 {

diff --git a/dom/storage/DOMStorageIPC.h b/dom/storage/DOMStorageIPC.h
@@ -125,6 +125,10 @@ class DOMStorageDBParent final : public PStorageParent
 public:
   DOMStorageDBParent();
 
+  virtual mozilla::ipc::IProtocol*
+  CloneProtocol(Channel* aChannel,
+                mozilla::ipc::ProtocolCloneContext* aCtx) override;
+
   NS_IMETHOD_(MozExternalRefCountType) AddRef(void);
   NS_IMETHOD_(MozExternalRefCountType) Release(void);
 

diff --git a/gfx/ipc/VsyncBridgeChild.cpp b/gfx/ipc/VsyncBridgeChild.cpp
@@ -146,7 +146,7 @@ VsyncBridgeChild::ProcessingError(Result aCode, const char* aReason)
 }
 
 void
-VsyncBridgeChild::HandleFatalError(const char* aName, const char* aMsg) const
+VsyncBridgeChild::FatalError(const char* const aName, const char* const aMsg) const
 {
   dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
 }

diff --git a/gfx/ipc/VsyncBridgeChild.h b/gfx/ipc/VsyncBridgeChild.h
@@ -33,7 +33,7 @@ class VsyncBridgeChild final : public PVsyncBridgeChild
 
   void NotifyVsync(TimeStamp aTimeStamp, const uint64_t& aLayersId);
 
-  virtual void HandleFatalError(const char* aName, const char* aMsg) const override;
+  virtual void FatalError(const char* const aName, const char* const aMsg) const override;
 
 private:
   VsyncBridgeChild(RefPtr<VsyncIOThreadHolder>, const uint64_t& aProcessToken);

diff --git a/gfx/layers/IPDLActor.h b/gfx/layers/IPDLActor.h
@@ -38,7 +38,7 @@ class ParentActor : public Protocol
     return true;
   }
 
-  typedef ipc::IProtocol::ActorDestroyReason Why;
+  typedef ipc::IProtocolManager<ipc::IProtocol>::ActorDestroyReason Why;
 
   virtual void ActorDestroy(Why) override {
     DestroyIfNeeded();

diff --git a/gfx/layers/ipc/APZCTreeManagerChild.cpp b/gfx/layers/ipc/APZCTreeManagerChild.cpp
@@ -262,5 +262,13 @@ APZCTreeManagerChild::RecvNotifyPinchGesture(const PinchGestureType& aType,
   return true;
 }
 
+void
+APZCTreeManagerChild::OnProcessingError(
+        Result aCode,
+        const char* aReason)
+{
+  MOZ_RELEASE_ASSERT(aCode != MsgDropped);
+}
+
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/ipc/APZCTreeManagerChild.h b/gfx/layers/ipc/APZCTreeManagerChild.h
@@ -86,6 +86,11 @@ class APZCTreeManagerChild
           LayoutDeviceIntPoint aRefPoint,
           EventMessage aEventMessage) override;
 
+  void
+  OnProcessingError(
+          Result aCode,
+          const char* aReason) override;
+
 protected:
   bool RecvHandleTap(const TapType& aType,
                      const LayoutDevicePoint& aPoint,

diff --git a/gfx/layers/ipc/CompositorBridgeChild.cpp b/gfx/layers/ipc/CompositorBridgeChild.cpp
@@ -1124,7 +1124,7 @@ CompositorBridgeChild::WillEndTransaction()
 }
 
 void
-CompositorBridgeChild::HandleFatalError(const char* aName, const char* aMsg) const
+CompositorBridgeChild::FatalError(const char* const aName, const char* const aMsg) const
 {
   dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
 }

diff --git a/gfx/layers/ipc/CompositorBridgeChild.h b/gfx/layers/ipc/CompositorBridgeChild.h
@@ -134,7 +134,7 @@ class CompositorBridgeChild final : public PCompositorBridgeChild,
                                        TextureFlags aFlags,
                                        uint64_t aSerial) override;
 
-  virtual void HandleFatalError(const char* aName, const char* aMsg) const override;
+  virtual void FatalError(const char* const aName, const char* const aMsg) const override;
 
   /**
    * Request that the parent tell us when graphics are ready on GPU.

diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp
@@ -1230,7 +1230,7 @@ ImageBridgeChild::CanSend() const
 }
 
 void
-ImageBridgeChild::HandleFatalError(const char* aName, const char* aMsg) const
+ImageBridgeChild::FatalError(const char* const aName, const char* const aMsg) const
 {
   dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
 }

diff --git a/gfx/layers/ipc/ImageBridgeChild.h b/gfx/layers/ipc/ImageBridgeChild.h
@@ -349,7 +349,7 @@ class ImageBridgeChild final : public PImageBridgeChild
     return InImageBridgeChildThread();
   }
 
-  virtual void HandleFatalError(const char* aName, const char* aMsg) const override;
+  virtual void FatalError(const char* const aName, const char* const aMsg) const override;
 
 protected:
   ImageBridgeChild();

diff --git a/gfx/vr/ipc/VRManagerChild.cpp b/gfx/vr/ipc/VRManagerChild.cpp
@@ -568,7 +568,7 @@ VRManagerChild::RemoveListener(dom::VREventObserver* aObserver)
 }
 
 void
-VRManagerChild::HandleFatalError(const char* aName, const char* aMsg) const
+VRManagerChild::FatalError(const char* const aName, const char* const aMsg) const
 {
   dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
 }

diff --git a/gfx/vr/ipc/VRManagerChild.h b/gfx/vr/ipc/VRManagerChild.h
@@ -87,7 +87,7 @@ class VRManagerChild : public PVRManagerChild
   void FireDOMVRDisplayDisconnectEvent();
   void FireDOMVRDisplayPresentChangeEvent();
 
-  virtual void HandleFatalError(const char* aName, const char* aMsg) const override;
+  virtual void FatalError(const char* const aName, const char* const aMsg) const override;
 
 protected:
   explicit VRManagerChild();

diff --git a/hal/sandbox/SandboxHal.cpp b/hal/sandbox/SandboxHal.cpp
@@ -901,6 +901,18 @@ class HalParent : public PHalParent
     hal::FactoryReset(reason);
     return true;
   }
+
+  virtual mozilla::ipc::IProtocol*
+  CloneProtocol(Channel* aChannel,
+                mozilla::ipc::ProtocolCloneContext* aCtx) override
+  {
+    ContentParent* contentParent = aCtx->GetContentParent();
+    nsAutoPtr<PHalParent> actor(contentParent->AllocPHalParent());
+    if (!actor || !contentParent->RecvPHalConstructor(actor)) {
+      return nullptr;
+    }
+    return actor.forget();
+  }
 };
 
 class HalChild : public PHalChild {

diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
@@ -472,7 +472,7 @@ class AutoEnterTransaction
     nsAutoPtr<IPC::Message> mReply;
 };
 
-MessageChannel::MessageChannel(IToplevelProtocol *aListener)
+MessageChannel::MessageChannel(MessageListener *aListener)
   : mListener(aListener),
     mChannelState(ChannelClosed),
     mSide(UnknownSide),
@@ -1856,16 +1856,10 @@ MessageChannel::MaybeUndeferIncall()
     task->Post();
 }
 
-void
-MessageChannel::EnteredCxxStack()
-{
-    mListener->EnteredCxxStack();
-}
-
 void
 MessageChannel::ExitedCxxStack()
 {
-    mListener->ExitedCxxStack();
+    mListener->OnExitedCxxStack();
     if (mSawInterruptOutMsg) {
         MonitorAutoLock lock(*mMonitor);
         // see long comment in OnMaybeDequeueOne()
@@ -1874,30 +1868,6 @@ MessageChannel::ExitedCxxStack()
     }
 }
 
-void
-MessageChannel::EnteredCall()
-{
-    mListener->EnteredCall();
-}
-
-void
-MessageChannel::ExitedCall()
-{
-    mListener->ExitedCall();
-}
-
-void
-MessageChannel::EnteredSyncSend()
-{
-    mListener->OnEnteredSyncSend();
-}
-
-void
-MessageChannel::ExitedSyncSend()
-{
-    mListener->OnExitedSyncSend();
-}
-
 void
 MessageChannel::EnqueuePendingMessages()
 {
@@ -1983,7 +1953,7 @@ MessageChannel::ShouldContinueFromTimeout()
     bool cont;
     {
         MonitorAutoUnlock unlock(*mMonitor);
-        cont = mListener->ShouldContinueFromReplyTimeout();
+        cont = mListener->OnReplyTimeout();
         mListener->ArtificialSleep();
     }
 
@@ -2032,7 +2002,7 @@ void
 MessageChannel::ReportMessageRouteError(const char* channelName) const
 {
     PrintErrorMessage(mSide, channelName, "Need a route");
-    mListener->ProcessingError(MsgRouteError, "MsgRouteError");
+    mListener->OnProcessingError(MsgRouteError, "MsgRouteError");
 }
 
 void
@@ -2074,7 +2044,7 @@ MessageChannel::ReportConnectionError(const char* aChannelName, Message* aMsg) c
     }
 
     MonitorAutoUnlock unlock(*mMonitor);
-    mListener->ProcessingError(MsgDropped, errorMsg);
+    mListener->OnProcessingError(MsgDropped, errorMsg);
 }
 
 bool
@@ -2119,7 +2089,7 @@ MessageChannel::MaybeHandleError(Result code, const Message& aMsg, const char* c
 
     PrintErrorMessage(mSide, channelName, reason);
 
-    mListener->ProcessingError(code, reason);
+    mListener->OnProcessingError(code, reason);
 
     return false;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     void
-    VideoDecoderManagerChild::HandleFatalError(const char* aName, const char* aMsg) const
+    VideoDecoderManagerChild::FatalError(const char* const aName, const char* const aMsg) const
     {
       dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
     }
@@ Expand Down @@