Backed out changeset 663cde4dd044 (bug 1287004) for crashes [@ XGetWindowAttributes]
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 13 Sep 2016 21:06:19 -0700
changeset 313774 908976ec552609d50bf14f5cace757808a51864f
parent 313773 3f47a92541c8e445757683d0e3e21e6df5d1a0d2
child 313775 484087507430a3008fdc0d54685e3c3d4b82f948
push id81712
push userphilringnalda@gmail.com
push dateWed, 14 Sep 2016 04:06:41 +0000
treeherdermozilla-inbound@908976ec5526 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1287004
milestone51.0a1
backs out663cde4dd04473cc3106f8bf1f64332f27a0f131
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 changeset 663cde4dd044 (bug 1287004) for crashes [@ XGetWindowAttributes] CLOSED TREE
gfx/tests/browser/browser_windowless_troubleshoot_crash.js
widget/PuppetWidget.cpp
--- a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
+++ b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
@@ -23,17 +23,17 @@ add_task(function* test_windowlessBrowse
   });
   webNav.loadURI("about:blank", 0, null, null, null);
 
   yield onLoaded;
 
   let winUtils = webNav.document.defaultView.
                         QueryInterface(Ci.nsIInterfaceRequestor).
                         getInterface(Ci.nsIDOMWindowUtils);
-  is(winUtils.layerManagerType, "Basic", "windowless browser's layerManagerType should be 'Basic'");
+  is(winUtils.layerManagerType, "None", "windowless browser's layerManagerType should be 'None'");
 
   ok(true, "not crashed");
 
   var Troubleshoot = Cu.import("resource://gre/modules/Troubleshoot.jsm", {}).Troubleshoot;
   var data = yield new Promise((resolve, reject) => {
     Troubleshoot.snapshot((data) => {
       resolve(data);
     });
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -564,24 +564,16 @@ PuppetWidget::ExecuteNativeKeyBinding(Na
 #endif
 }
 
 LayerManager*
 PuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
                               LayersBackend aBackendHint,
                               LayerManagerPersistence aPersistence)
 {
-  if (XRE_IsParentProcess()) {
-    // A PuppetWidget in the parent process is for a windowless browser. Let's
-    // try to pretend this is a normal top-level window.
-    return nsBaseWidget::GetLayerManager(aShadowManager,
-                                         aBackendHint,
-                                         aPersistence);
-  }
-
   if (!mLayerManager) {
     mLayerManager = new ClientLayerManager(this);
   }
   ShadowLayerForwarder* lf = mLayerManager->AsShadowForwarder();
   if (!lf->HasShadowManager() && aShadowManager) {
     lf->SetShadowManager(aShadowManager);
   }
   return mLayerManager;