Bug 1155228 - Only use basic OMTC for popups when using WARP. r=jrmuizel, a=sledru
authorBas Schouten <bschouten@mozilla.com>
Fri, 17 Apr 2015 10:32:32 -0400
changeset 258536 4dc8d874746b
parent 258535 746934eab883
child 258537 18af6cfb3b86
push id4691
push userryanvm@gmail.com
push date2015-04-20 17:16 +0000
treeherdermozilla-beta@72f1b4086067 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, sledru
bugs1155228
milestone38.0
Bug 1155228 - Only use basic OMTC for popups when using WARP. r=jrmuizel, a=sledru
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -6572,17 +6572,17 @@ nsWindow::GetPreferredCompositorBackends
   LayerManagerPrefs prefs;
   GetLayerManagerPrefs(&prefs);
 
   // We don't currently support using an accelerated layer manager with
   // transparent windows so don't even try. I'm also not sure if we even
   // want to support this case. See bug 593471
   if (!(prefs.mDisableAcceleration ||
         mTransparencyMode == eTransparencyTransparent ||
-        IsPopup())) {
+        (IsPopup() && gfxWindowsPlatform::GetPlatform()->IsWARP()))) {
     // See bug 1150376, D3D11 composition can cause issues on some devices
     // on windows 7 where presentation fails randomly for windows with drop
     // shadows.
     if (prefs.mPreferOpenGL) {
       aHints.AppendElement(LayersBackend::LAYERS_OPENGL);
     }
 
     ID3D11Device* device = gfxWindowsPlatform::GetPlatform()->GetD3D11Device();