Bug 1127321 - Add missing member in TileClient copy constructor and assignment operator. r=jrmuizel
☠☠ backed out by 29c52dbbd2ab ☠ ☠
authorNicolas Silva <nsilva@mozilla.com>
Mon, 02 Feb 2015 15:30:32 +0100
changeset 227005 31c0fd2b6e8dddbc2c2f61bef7c511e843e64274
parent 227004 f33056f503c5de3ca26ce9907d8ad69d651e4d33
child 227006 a1d913968a8a0a73a2b78b1a576f9462ccc77458
push id54984
push usernsilva@mozilla.com
push dateMon, 02 Feb 2015 14:31:07 +0000
treeherdermozilla-inbound@a1d913968a8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1127321
milestone38.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 1127321 - Add missing member in TileClient copy constructor and assignment operator. r=jrmuizel
gfx/layers/client/TiledContentClient.cpp
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -512,16 +512,17 @@ TileClient::TileClient(const TileClient&
   mFrontLock = o.mFrontLock;
   mCompositableClient = o.mCompositableClient;
 #ifdef GFX_TILEDLAYER_DEBUG_OVERLAY
   mLastUpdate = o.mLastUpdate;
 #endif
   mManager = o.mManager;
   mInvalidFront = o.mInvalidFront;
   mInvalidBack = o.mInvalidBack;
+  mExpirationState = o.mExpirationState;
 }
 
 TileClient&
 TileClient::operator=(const TileClient& o)
 {
   if (this == &o) return *this;
   mBackBuffer.Set(this, o.mBackBuffer);
   mBackBufferOnWhite = o.mBackBufferOnWhite;
@@ -531,16 +532,17 @@ TileClient::operator=(const TileClient& 
   mFrontLock = o.mFrontLock;
   mCompositableClient = o.mCompositableClient;
 #ifdef GFX_TILEDLAYER_DEBUG_OVERLAY
   mLastUpdate = o.mLastUpdate;
 #endif
   mManager = o.mManager;
   mInvalidFront = o.mInvalidFront;
   mInvalidBack = o.mInvalidBack;
+  mExpirationState = o.mExpirationState;
   return *this;
 }
 
 
 void
 TileClient::Flip()
 {
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17