Decouple CairoImage from ImageContainer. (bug 1222910, r=roc)

2015-11-17 00:09:00 -08:00
parent b2b9f596f2
commit 94c51e6a9a
8 changed files with 19 additions and 71 deletions
--- a/dom/html/HTMLCanvasElement.cpp
+++ b/dom/html/HTMLCanvasElement.cpp
@@ -1173,13 +1173,7 @@ void
 HTMLCanvasElement::SetFrameCapture(already_AddRefed<SourceSurface> aSurface)
 {
  RefPtr<SourceSurface> surface = aSurface;
-
-  CairoImage::Data imageData;
-  imageData.mSize = surface->GetSize();
-  imageData.mSourceSurface = surface;
-
-  RefPtr<CairoImage> image = new CairoImage();
-  image->SetData(imageData);
+  RefPtr<CairoImage> image = new CairoImage(surface->GetSize(), surface);

  // Loop backwards to allow removing elements in the loop.
  for (int i = mRequestedFrameListeners.Length() - 1; i >= 0; --i) {