Remove support for -webkit-canvas and Document.getCSSCanvasContext.

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

 /*
  * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
 class CanvasRenderingContext;
 class CanvasRenderingContextFactory;
 class GraphicsContext;
 class HTMLCanvasElement;
 class Image;
 class ImageBuffer;
 class ImageBufferSurface;
 class ImageData;
 class IntSize;
 
 class CORE_EXPORT CanvasObserver : public WillBeGarbageCollectedMixin {

[Justin Novosad, 2015/10/23 18:21:12]

Nuke this.

     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);
 public:
     DECLARE_NODE_FACTORY(HTMLCanvasElement);
     ~HTMLCanvasElement() override;
 
     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(); }
 
     const IntSize& size() const { return m_size; }
 
     void setWidth(int);
     void setHeight(int);
-    void setAccelerationDisabled(bool accelerationDisabled) { m_accelerationDisabled = accelerationDisabled; }
-    bool accelerationDisabled() const { return m_accelerationDisabled; }
 
     void setSize(const IntSize& newSize)
     {
         if (newSize == size())
             return;
         m_ignoreReset = true;
         setWidth(newSize.width());
         setHeight(newSize.height());
         m_ignoreReset = false;
         reset();
     }
 
     // Called by HTMLCanvasElement's V8 bindings.
     ScriptValue getContext(ScriptState*, const String&, const CanvasContextCreationAttributes&);
     // Called by Document::getCSSCanvasContext as well as above getContext().
     CanvasRenderingContext* getCanvasRenderingContext(const String&, const CanvasContextCreationAttributes&);
 
     bool isPaintable() const;
 
     static String toEncodingMimeType(const String& mimeType);
     String toDataURL(const String& mimeType, const ScriptValue& qualityArgument, ExceptionState&) const;
     String toDataURL(const String& mimeType, ExceptionState& exceptionState) const { return toDataURL(mimeType, ScriptValue(), exceptionState); }
 
     void toBlob(FileCallback*, const String& mimeType, const ScriptValue& qualityArgument, ExceptionState&);
     void toBlob(FileCallback* callback, const String& mimeType, ExceptionState& exceptionState) { return toBlob(callback, mimeType, ScriptValue(), exceptionState); }
 
     // Used for rendering
     void didDraw(const FloatRect&);
-    void notifyObserversCanvasChanged(const FloatRect&);

[Justin Novosad, 2015/10/23 18:21:12]

This was so fragile. Glad to see it go!

[chrishtr, 2015/10/23 19:47:06]

ACK!

 
     void paint(GraphicsContext*, const LayoutRect&);
 
     SkCanvas* drawingCanvas() const;
     void disableDeferral() const;
     SkCanvas* existingDrawingCanvas() const;
 
     void setRenderingContext(PassOwnPtrWillBeRawPtr<CanvasRenderingContext>);
     CanvasRenderingContext* renderingContext() const { return m_context.get(); }
 
@@ skipping 76 matching lines @@
     void setSurfaceSize(const IntSize&);
 
     bool paintsIntoCanvasBuffer() const;
 
     ImageData* toImageData(SourceDrawingBuffer) const;
     String toDataURLInternal(const String& mimeType, const double& quality, SourceDrawingBuffer) const;
 
     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;
 
     bool m_originClean;
 
     // It prevents HTMLCanvasElement::buffer() from continuously re-attempting to allocate an imageBuffer
     // after the first attempt failed.
     mutable bool m_didFailToCreateImageBuffer;
     bool m_imageBufferIsClear;
     OwnPtr<ImageBuffer> m_imageBuffer;
 
     mutable RefPtr<Image> m_copiedImage; // FIXME: This is temporary for platforms that have to copy the image buffer to render (and for CSSCanvasValue).
 };
 
 } // namespace blink
 
 #endif // HTMLCanvasElement_h