Bug 1194775 - Paper over a crash in ContentClient. r=Bas
authorNicolas Silva <nsilva@mozilla.com>
Tue, 27 Oct 2015 18:21:58 +0100
changeset 269857 d48deb2b74ddaab1cc134787a02ae61f1f47d3ce
parent 269856 fbe8ec51aa386356cff2198d92a6e9bd5e8d6906
child 269858 406fa8040abd20246cf4bdedc969c1d9874d5554
push id29593
push usercbook@mozilla.com
push dateWed, 28 Oct 2015 09:44:28 +0000
treeherdermozilla-central@fc706d376f06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBas
bugs1194775
milestone44.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 1194775 - Paper over a crash in ContentClient. r=Bas
gfx/layers/RotatedBuffer.cpp
--- a/gfx/layers/RotatedBuffer.cpp
+++ b/gfx/layers/RotatedBuffer.cpp
@@ -301,19 +301,22 @@ RotatedContentBuffer::BorrowDrawTargetFo
                                                  -quadrantRect.y));
 
   return mLoanedDrawTarget;
 }
 
 void
 BorrowDrawTarget::ReturnDrawTarget(gfx::DrawTarget*& aReturned)
 {
+  MOZ_ASSERT(mLoanedDrawTarget);
   MOZ_ASSERT(aReturned == mLoanedDrawTarget);
-  mLoanedDrawTarget->SetTransform(mLoanedTransform);
-  mLoanedDrawTarget = nullptr;
+  if (mLoanedDrawTarget) {
+    mLoanedDrawTarget->SetTransform(mLoanedTransform);
+    mLoanedDrawTarget = nullptr;
+  }
   aReturned = nullptr;
 }
 
 gfxContentType
 RotatedContentBuffer::BufferContentType()
 {
   if (mBufferProvider || mDTBuffer) {
     SurfaceFormat format;