Bug 1032125: Part 2: Prevent DOM Storage from sending IPC after Nuwa ready. r=khuey
☠☠ backed out by 72744146976d ☠ ☠
authorPatrick Wang (Chih-Kai Wang) <kk1fff@patrickz.net>
Fri, 19 Sep 2014 17:12:10 +0800
changeset 206214 e193cf8cb61640a25590fdecb2231317e4afcf4a
parent 206213 0b73bd6d5d9c09e337e9beb92c05860b6208b61c
child 206215 422fd81a4118e76879a529fd53ddaef0b21d0bc4
push id27516
push userryanvm@gmail.com
push dateFri, 19 Sep 2014 17:54:48 +0000
treeherdermozilla-central@b00bdb144e06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs1032125
milestone35.0a1
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
Bug 1032125: Part 2: Prevent DOM Storage from sending IPC after Nuwa ready. r=khuey
dom/storage/DOMStorageIPC.cpp
--- a/dom/storage/DOMStorageIPC.cpp
+++ b/dom/storage/DOMStorageIPC.cpp
@@ -584,18 +584,25 @@ DOMStorageDBParent::RecvAsyncFlush()
 
 // DOMStorageObserverSink
 
 nsresult
 DOMStorageDBParent::Observe(const char* aTopic,
                             const nsACString& aScopePrefix)
 {
   if (mIPCOpen) {
-    mozilla::unused << SendObserve(nsDependentCString(aTopic),
-                                   nsCString(aScopePrefix));
+#ifdef MOZ_NUWA_PROCESS
+    if (!(static_cast<ContentParent*>(Manager())->IsNuwaProcess() &&
+          ContentParent::IsNuwaReady())) {
+#endif
+      mozilla::unused << SendObserve(nsDependentCString(aTopic),
+                                     nsCString(aScopePrefix));
+#ifdef MOZ_NUWA_PROCESS
+    }
+#endif
   }
 
   return NS_OK;
 }
 
 namespace { // anon
 
 // Results must be sent back on the main thread