Backed out changeset 4014e85aec87 (bug 1211615) for build bustage a=backout
authorWes Kocher <wkocher@mozilla.com>
Fri, 16 Oct 2015 11:23:53 -0700
changeset 289572 d7c8d0af1b08
parent 289571 4014e85aec87
child 289573 170d29280d87
push id5194
push userkwierso@gmail.com
push date2015-10-16 18:23 +0000
treeherdermozilla-beta@d7c8d0af1b08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1211615
milestone42.0
backs out4014e85aec87
Backed out changeset 4014e85aec87 (bug 1211615) for build bustage a=backout
gfx/layers/composite/TextureHost.cpp
gfx/layers/d3d9/TextureD3D9.cpp
--- a/gfx/layers/composite/TextureHost.cpp
+++ b/gfx/layers/composite/TextureHost.cpp
@@ -588,36 +588,31 @@ BufferTextureHost::Upload(nsIntRegion *a
         !srcY->Update(tempY) ||
         !srcU->Update(tempCb) ||
         !srcV->Update(tempCr)) {
       NS_WARNING("failed to update the DataTextureSource");
       return false;
     }
   } else {
     // non-YCbCr case
-    const nsIntRegion* regionToUpdate = aRegion;
     if (!mFirstSource) {
       mFirstSource = mCompositor->CreateDataTextureSource();
-      if (mFlags & TextureFlags::COMPONENT_ALPHA) {
-        // Update the full region the first time for component alpha textures.
-        regionToUpdate = nullptr;
-      }
     }
     ImageDataDeserializer deserializer(GetBuffer(), GetBufferSize());
     if (!deserializer.IsValid()) {
       NS_ERROR("Failed to deserialize image!");
       return false;
     }
 
     RefPtr<gfx::DataSourceSurface> surf = deserializer.GetAsSurface();
     if (!surf) {
       return false;
     }
 
-    if (!mFirstSource->Update(surf.get(), regionToUpdate)) {
+    if (!mFirstSource->Update(surf.get(), aRegion)) {
       NS_WARNING("failed to update the DataTextureSource");
       return false;
     }
   }
   MOZ_ASSERT(mFirstSource);
   return true;
 }
 
--- a/gfx/layers/d3d9/TextureD3D9.cpp
+++ b/gfx/layers/d3d9/TextureD3D9.cpp
@@ -819,27 +819,22 @@ DataTextureSourceD3D9::UpdateFromTexture
 void
 TextureHostD3D9::UpdatedInternal(const nsIntRegion* aRegion)
 {
   MOZ_ASSERT(mTexture);
   if (!mTexture) {
     return;
   }
 
-  const nsIntRegion* regionToUpdate = aRegion;
   if (!mTextureSource) {
     mTextureSource = new DataTextureSourceD3D9(mFormat, mSize, mCompositor,
                                                nullptr, mFlags);
-    if (mFlags & TextureFlags::COMPONENT_ALPHA) {
-      // Update the full region the first time for component alpha textures.
-      regionToUpdate = nullptr;
-    }
   }
 
-  if (!mTextureSource->UpdateFromTexture(mTexture, regionToUpdate)) {
+  if (!mTextureSource->UpdateFromTexture(mTexture, aRegion)) {
     gfxCriticalError() << "[D3D9] DataTextureSourceD3D9::UpdateFromTexture failed";
   }
 }
 
 IDirect3DDevice9*
 TextureHostD3D9::GetDevice()
 {
   return mCompositor ? mCompositor->device() : nullptr;