Backout 54d4d88b2f2f from Bug 1172014 which was causing Bug 1176548
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Sun, 21 Jun 2015 23:16:13 -0400
changeset 249957 026e77985e59fa57715aa30b3117091caeaba597
parent 249956 ecd0e715d9480fe1ae997d016d0d026462f3d533
child 249958 be81b8d6fae99c89e8b14591b11dd26eec0a416e
child 250001 4eac2966dab77debb7f6a227f924e35451e63f48
push id28940
push usercbook@mozilla.com
push dateMon, 22 Jun 2015 12:03:34 +0000
treeherdermozilla-central@be81b8d6fae9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1172014, 1176548
milestone41.0a1
backs out54d4d88b2f2f96f3790f8c8c4855a6686b86efd3
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
Backout 54d4d88b2f2f from Bug 1172014 which was causing Bug 1176548
gfx/layers/client/TextureClient.cpp
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -355,16 +355,17 @@ TextureClient::CreateForDrawing(ISurface
       aSize.width <= maxTextureSize &&
       aSize.height <= maxTextureSize) {
     if (gfxWindowsPlatform::GetPlatform()->GetD3D9Device()) {
       texture = new CairoTextureClientD3D9(aAllocator, aFormat, aTextureFlags);
     }
   }
 
   if (!texture && aFormat == SurfaceFormat::B8G8R8X8 &&
+      aAllocator->IsSameProcess() &&
       aMoz2DBackend == gfx::BackendType::CAIRO) {
     if (aAllocator->IsSameProcess()) {
       texture = new TextureClientMemoryDIB(aAllocator, aFormat, aTextureFlags);
     } else {
       texture = new TextureClientShmemDIB(aAllocator, aFormat, aTextureFlags);
     }
   }
 #endif