Make OffscreenCanvas a member of CanvasImageSource

third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h

 /*
  * Copyright (C) 2009 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 52 matching lines @@
         ContextWebgl2 = 4,
         ContextImageBitmap = 5,
         ContextTypeCount,
     };
 
     static ContextType contextTypeFromId(const String& id);
     static ContextType resolveContextTypeAliases(ContextType);
 
     HTMLCanvasElement* canvas() const { return m_canvas; }
 
+    virtual PassRefPtr<Image> getImage(SnapshotReason) const = 0;
     virtual ContextType getContextType() const = 0;
     virtual bool isAccelerated() const { return false; }
     virtual bool shouldAntialias() const { return false; }
     virtual bool hasAlpha() const { return true; }
     virtual void setIsHidden(bool) = 0;
     virtual bool isContextLost() const { return true; }
     virtual void setCanvasGetContextResult(RenderingContext&) { NOTREACHED(); };
     virtual void setOffscreenCanvasGetContextResult(OffscreenRenderingContext&) { NOTREACHED(); }
+    virtual bool isPaintable() const = 0;
 
     // Return true if the content is updated.
     virtual bool paintRenderingResultsToCanvas(SourceDrawingBuffer) { return false; }
 
-    // Note: this function is strictly for OffscreenCanvas only.
-    virtual bool isPaintable() const = 0;
 
     virtual WebLayer* platformLayer() const { return nullptr; }
 
     enum LostContextMode {
         NotLostContext,
 
         // Lost context occurred at the graphics system level.
         RealLostContext,
 
         // Lost context provoked by WEBGL_lose_context.
@@ skipping 23 matching lines @@
     // WebGL-specific interface
     virtual bool is3d() const { return false; }
     virtual void setFilterQuality(SkFilterQuality) { NOTREACHED(); }
     virtual void reshape(int width, int height) { NOTREACHED(); }
     virtual void markLayerComposited() { NOTREACHED(); }
     virtual ImageData* paintRenderingResultsToImageData(SourceDrawingBuffer) { NOTREACHED(); return nullptr; }
     virtual int externallyAllocatedBytesPerPixel() { NOTREACHED(); return 0; }
 
     // ImageBitmap-specific interface
     virtual bool paint(GraphicsContext&, const IntRect&) { return false; }
-    virtual PassRefPtr<Image> getImage() const { return nullptr; }
-
-    bool wouldTaintOrigin(CanvasImageSource*, SecurityOrigin* = nullptr);
-    void didMoveToNewDocument(Document*);
 
     // OffscreenCanvas-specific methods
     OffscreenCanvas* getOffscreenCanvas() const { return m_offscreenCanvas; }
     virtual ImageBitmap* transferToImageBitmap(ExceptionState&) { return nullptr; }
 
+    bool wouldTaintOrigin(CanvasImageSource*, SecurityOrigin* = nullptr);
+    void didMoveToNewDocument(Document*);
+
     void detachCanvas() { m_canvas = nullptr; }
 
 protected:
     CanvasRenderingContext(HTMLCanvasElement* = nullptr, OffscreenCanvas* = nullptr);
     DECLARE_VIRTUAL_TRACE();
     virtual void stop() = 0;
 
 private:
     void dispose();
 
     Member<HTMLCanvasElement> m_canvas;
     Member<OffscreenCanvas> m_offscreenCanvas;
     HashSet<String> m_cleanURLs;
     HashSet<String> m_dirtyURLs;
 };
 
 } // namespace blink
 
 #endif