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 f8b1b19abcd8ac856b20ee4c9e9f5132794baa76..43d3529cb098008cccd10ed729ab1f9e307609c6 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.h |
+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.h |
@@ -61,18 +61,6 @@ class ImageBufferSurface; |
class ImageData; |
class IntSize; |
-class CORE_EXPORT CanvasObserver : public WillBeGarbageCollectedMixin { |
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(CanvasObserver); |
-public: |
- virtual void canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect) = 0; |
- virtual void canvasResized(HTMLCanvasElement*) = 0; |
-#if !ENABLE(OILPAN) |
- virtual void canvasDestroyed(HTMLCanvasElement*) = 0; |
-#endif |
- |
- DEFINE_INLINE_VIRTUAL_TRACE() { } |
-}; |
- |
class CORE_EXPORT HTMLCanvasElement final : public HTMLElement, public DocumentVisibilityObserver, public CanvasImageSource, public ImageBufferClient { |
DEFINE_WRAPPERTYPEINFO(); |
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLCanvasElement); |
@@ -82,9 +70,6 @@ public: |
static WebThread* getToBlobThreadInstance(); |
- void addObserver(CanvasObserver*); |
- void removeObserver(CanvasObserver*); |
- |
// Attributes and functions exposed to script |
int width() const { return size().width(); } |
int height() const { return size().height(); } |
@@ -93,8 +78,6 @@ public: |
void setWidth(int); |
void setHeight(int); |
- void setAccelerationDisabled(bool accelerationDisabled) { m_accelerationDisabled = accelerationDisabled; } |
- bool accelerationDisabled() const { return m_accelerationDisabled; } |
void setSize(const IntSize& newSize) |
{ |
@@ -123,7 +106,6 @@ public: |
// Used for rendering |
void didDraw(const FloatRect&); |
- void notifyObserversCanvasChanged(const FloatRect&); |
void paint(GraphicsContext*, const LayoutRect&); |
@@ -220,14 +202,11 @@ private: |
static void encodeImageAsync(DOMUint8ClampedArray* imagedata, IntSize imageSize, FileCallback*, const String& mimeType, double quality); |
static void createBlobAndCall(PassOwnPtr<Vector<char>> encodedImage, const String& mimeType, FileCallback*); |
- WillBeHeapHashSet<RawPtrWillBeWeakMember<CanvasObserver>> m_observers; |
- |
IntSize m_size; |
OwnPtrWillBeMember<CanvasRenderingContext> m_context; |
bool m_ignoreReset; |
- bool m_accelerationDisabled; |
FloatRect m_dirtyRect; |
mutable intptr_t m_externallyAllocatedMemory; |