Refactor ImageBuffer to make OffscreenCanvas match HTMLCanvasElement

third_party/WebKit/Source/core/html/HTMLCanvasElement.h

Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.h b/third_party/WebKit/Source/core/html/HTMLCanvasElement.h
index 2c443b2bf1f808d21710846edac51e45f7e56ab3..bc3df9553a9a3805672b1b6dcb352d18c96c6b89 100644
--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.h
@@ -147,7 +147,6 @@ class CORE_EXPORT HTMLCanvasElement final
   CanvasRenderingContext* RenderingContext() const { return context_.Get(); }
 
   void EnsureUnacceleratedImageBuffer();
-  ImageBuffer* Buffer() const;
   PassRefPtr<Image> CopiedImage(SourceDrawingBuffer,
                                 AccelerationHint,
                                 SnapshotReason) const;
@@ -162,8 +161,9 @@ class CORE_EXPORT HTMLCanvasElement final
   bool Is2d() const;
   bool IsAnimated2d() const;
 
-  bool HasImageBuffer() const { return image_buffer_.get(); }
-  void DiscardImageBuffer();
+  bool HasImageBuffer() const override { return !!image_buffer_; }
+  void DiscardImageBuffer() override;
+  ImageBuffer* GetImageBuffer() const override;

[Justin Novosad, 2017/05/01 15:18:57]

This should be called GetOrCreateImageBuffer() IMHO, to make it clear that it
may return non-null even when HasImageBuffer() returns false.

[fserb, 2017/05/02 18:49:30]

done

 
   bool ShouldBeDirectComposited() const;