Bug 1292786 - Don't SetFrameCapture() when CopySurface() fails. r?nical draft
authorAndreas Pehrson <pehrsons@gmail.com>
Wed, 17 Aug 2016 15:54:56 +0200
changeset 401697 955adbc3483f4f1624c9ec3f0c0343a0895032a1
parent 401500 fe895421dfbe1f1f8f1fc6a39bb20774423a6d74
child 528580 9e972879a5b0d618544cb8d6ab0c0d2854f83338
push id26559
push userpehrsons@gmail.com
push dateWed, 17 Aug 2016 13:55:41 +0000
reviewersnical
bugs1292786
milestone51.0a1
Bug 1292786 - Don't SetFrameCapture() when CopySurface() fails. r?nical MozReview-Commit-ID: FNNMs6N9lJF
dom/html/HTMLCanvasElement.cpp
--- a/dom/html/HTMLCanvasElement.cpp
+++ b/dom/html/HTMLCanvasElement.cpp
@@ -125,16 +125,19 @@ public:
     }
 
     RefPtr<SourceSurface> snapshot = mOwningElement->GetSurfaceSnapshot(nullptr);
     if (!snapshot) {
       return;
     }
 
     RefPtr<DataSourceSurface> copy = CopySurface(snapshot);
+    if (!copy) {
+      return;
+    }
 
     mOwningElement->SetFrameCapture(copy.forget());
     mOwningElement->MarkContextCleanForFrameCapture();
   }
 
   void DetachFromRefreshDriver()
   {
     MOZ_ASSERT(mOwningElement);