Make OffscreenCanvas a member of CanvasImageSource

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 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 42 matching lines @@
 class Font;
 class FontMetrics;
 class HitRegion;
 class HitRegionOptions;
 class HitRegionManager;
 class HitTestCanvasResult;
 class Path2D;
 class SVGMatrixTearOff;
 class TextMetrics;
 
-typedef HTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmap CanvasImageSourceUnion;
+typedef HTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmapOrOffscreenCanvas CanvasImageSourceUnion;
 
 class MODULES_EXPORT CanvasRenderingContext2D final : public CanvasRenderingContext, public BaseRenderingContext2D, public WebThread::TaskObserver, public SVGResourceClient {
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2D);
     USING_PRE_FINALIZER(CanvasRenderingContext2D, dispose);
 public:
     class Factory : public CanvasRenderingContextFactory {
         WTF_MAKE_NONCOPYABLE(Factory);
     public:
         Factory() {}
@@ skipping 86 matching lines @@
 
     AffineTransform baseTransform() const final;
     void didDraw(const SkIRect& dirtyRect) final;
 
     bool stateHasFilter() final;
     SkImageFilter* stateGetFilter() final;
     void snapshotStateForFilter() final;
 
     void validateStateStack() final;
 
+    PassRefPtr<Image> getImage(SnapshotReason) const final;
+
     bool isAccelerationOptimalForCanvasContent() const;
 
     void resetUsageTracking();
 
-    void incrementFrameCount() { m_usageCounters.numFramesSinceReset++; };
+    void incrementFrameCount() { m_usageCounters.numFramesSinceReset++; }
+
+    bool isPaintable() const final { return hasImageBuffer(); }
 
 private:
     friend class CanvasRenderingContext2DAutoRestoreSkCanvas;
 
     CanvasRenderingContext2D(HTMLCanvasElement*, const CanvasContextCreationAttributes& attrs, Document&);
 
     void dispose();
 
     void dispatchContextLostEvent(TimerBase*);
     void dispatchContextRestoredEvent(TimerBase*);
@@ skipping 32 matching lines @@
     LostContextMode m_contextLostMode;
     bool m_contextRestorable;
     unsigned m_tryRestoreContextAttemptCount;
     Timer<CanvasRenderingContext2D> m_dispatchContextLostEventTimer;
     Timer<CanvasRenderingContext2D> m_dispatchContextRestoredEventTimer;
     Timer<CanvasRenderingContext2D> m_tryRestoreContextEventTimer;
 
     HashMap<String, Font> m_fontsResolvedUsingCurrentStyle;
     bool m_pruneLocalFontCacheScheduled;
     ListHashSet<String> m_fontLRUList;
-
-    bool isPaintable() const final
-    {
-        NOTREACHED();
-        return false;
-    }
 };
 
 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context,
     context->is2d() && context->canvas(), context.is2d() && context.canvas());
 
 } // namespace blink
 
 #endif // CanvasRenderingContext2D_h