Bug 1284721 - Partially backout some changes that got incidentally folded into the wrong patch. r=me
☠☠ backed out by 84b0f9eb63d0 ☠ ☠
authorNicolas Silva <nsilva@mozilla.com>
Fri, 08 Jul 2016 19:35:36 +0200
changeset 304277 b966ababca8d78c565c28214483e10a679f6c44e
parent 304276 75f6c7e15d7641a294a00ec454e34866807a0f83
child 304278 84b0f9eb63d0437db2e8aed0d906494f3514b745
push id30529
push userphilringnalda@gmail.com
push dateSat, 09 Jul 2016 15:59:57 +0000
treeherderautoland@679118259e91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1284721
milestone50.0a1
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
Bug 1284721 - Partially backout some changes that got incidentally folded into the wrong patch. r=me
gfx/layers/PersistentBufferProvider.cpp
--- a/gfx/layers/PersistentBufferProvider.cpp
+++ b/gfx/layers/PersistentBufferProvider.cpp
@@ -205,22 +205,20 @@ PersistentBufferProviderShared::ReturnDr
   MOZ_ASSERT(mDrawTarget == dt);
   MOZ_ASSERT(!mSnapshot);
 
   mDrawTarget = nullptr;
   dt = nullptr;
 
   mBack->Unlock();
 
-  if (mFront != mBack && !mBuffers.Contains(mFront)) {
-    mBuffers.AppendElement(mFront);
+  if (!mBuffer && mFront && !mFront->IsLocked()) {
+    mBuffer.swap(mFront);
   }
 
-  // Make mFront point to the now realized back buffer. mFront is what the next
-  // transaction will pick up and send to the compositor.
   mFront = mBack;
 
   return true;
 }
 
 already_AddRefed<gfx::SourceSurface>
 PersistentBufferProviderShared::BorrowSnapshot()
 {