Bug 1287004 - Give PuppetWidgets in parent process a compositor bridg…

…e (r=mattwoodrow)
dothq · Sep 14, 2016 · a430c0a · a430c0a
1 parent 3480df7
commit a430c0a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
@@ -28,7 +28,7 @@ add_task(function* test_windowlessBrowserTroubleshootCrash() {
   let winUtils = webNav.document.defaultView.
                         QueryInterface(Ci.nsIInterfaceRequestor).
                         getInterface(Ci.nsIDOMWindowUtils);
-  is(winUtils.layerManagerType, "None", "windowless browser's layerManagerType should be 'None'");
+  is(winUtils.layerManagerType, "Basic", "windowless browser's layerManagerType should be 'Basic'");
 
   ok(true, "not crashed");
 

diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
@@ -569,6 +569,14 @@ 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);
   }