autoland: changeset 304277:b966ababca8d78c565c28214483e10a679f6c44e

☠☠ backed out by 84b0f9eb63d0 ☠ ☠
author	Nicolas Silva <nsilva@mozilla.com>
	Fri, 08 Jul 2016 19:35:36 +0200
changeset 304277	b966ababca8d78c565c28214483e10a679f6c44e
parent 304276	75f6c7e15d7641a294a00ec454e34866807a0f83
child 304278	84b0f9eb63d0437db2e8aed0d906494f3514b745
push id	30529
push user	philringnalda@gmail.com
push date	Sat, 09 Jul 2016 15:59:57 +0000
treeherder	autoland@679118259e91 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
bugs	1284721
milestone	50.0a1
first release with	nightly linux32 679118259e91 / 50.0a1 / 20160710030217 / files nightly linux64 679118259e91 / 50.0a1 / 20160710030217 / files nightly mac 679118259e91 / 50.0a1 / 20160710030217 / files nightly win32 679118259e91 / 50.0a1 / 20160710030217 / files nightly win64 679118259e91 / 50.0a1 / 20160710030217 / files
last release without	nightly linux32 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly linux64 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly mac 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly win32 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly win64 45682df2d2d4 / 50.0a1 / 20160708030216 / files

--- 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()
 {