Disable OSX Plugin Layer due to regression b=633826 r+a=josh,bustage
authorBenoit Girard <b56girard@gmail.com>
Sun, 13 Feb 2011 21:54:33 -0500
changeset 62499 93cd6c60e16b34758a78d7f6b86963ce0cb1b3bb
parent 62498 c4fbf8fbc1035f046301ec1f1f8627d90c4a5643
child 62500 385abb827ff331157305e44c2792e2a3d632e2df
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs633826
milestone2.0b12pre
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
Disable OSX Plugin Layer due to regression b=633826 r+a=josh,bustage
layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1824,17 +1824,18 @@ nsObjectFrame::GetLayerState(nsDisplayLi
     return mozilla::LAYER_NONE;
 
 #ifdef XP_MACOSX
   if (aManager->GetBackendType() == LayerManager::LAYERS_OPENGL &&
       mInstanceOwner->GetEventModel() == NPEventModelCocoa &&
       mInstanceOwner->GetDrawingModel() == NPDrawingModelCoreGraphics &&
       mInstanceOwner->IsRemoteDrawingCoreAnimation())
   {
-    return mozilla::LAYER_ACTIVE;
+    // Disabled on Mac OS X for now.
+    return mozilla::LAYER_NONE;
   }
 #endif
 
   if (!mInstanceOwner->UseAsyncRendering())
     return mozilla::LAYER_NONE;
 
   return mozilla::LAYER_ACTIVE;
 }