Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / ImageBufferSurface.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp b/src/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
index 2869f4c..48e4b97 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp
@@ -35,8 +35,9 @@
 #include "platform/graphics/ImageBuffer.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
+#include "third_party/skia/include/core/SkPicture.h"
 
-namespace WebCore {
+namespace blink {
 
 ImageBufferSurface::ImageBufferSurface(const IntSize& size, OpacityMode opacityMode)
     : m_opacityMode(opacityMode)
@@ -45,6 +46,11 @@ ImageBufferSurface::ImageBufferSurface(const IntSize& size, OpacityMode opacityM
     setIsHidden(false);
 }
 
+PassRefPtr<SkPicture> ImageBufferSurface::getPicture()
+{
+    return nullptr;
+}
+
 void ImageBufferSurface::clear()
 {
     // Clear the background transparent or opaque, as required. It would be nice if this wasn't
@@ -55,12 +61,14 @@ void ImageBufferSurface::clear()
             canvas()->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode);
         else
             canvas()->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
+        didClearCanvas();
     }
 }
 
-const SkBitmap& ImageBufferSurface::bitmap() const
+const SkBitmap& ImageBufferSurface::bitmap()
 {
     ASSERT(canvas());
+    willAccessPixels();
     return canvas()->getTopDevice()->accessBitmap(false);
 }
 
@@ -70,4 +78,4 @@ const SkBitmap& ImageBufferSurface::cachedBitmap() const
     return nullBitmap;
 }
 
-} // namespace WebCore
+} // namespace blink