diff options
Diffstat (limited to 'Source/WebCore/html/canvas/CanvasRenderingContext.h')
| -rw-r--r-- | Source/WebCore/html/canvas/CanvasRenderingContext.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext.h b/Source/WebCore/html/canvas/CanvasRenderingContext.h index b5b2781f7..759080f53 100644 --- a/Source/WebCore/html/canvas/CanvasRenderingContext.h +++ b/Source/WebCore/html/canvas/CanvasRenderingContext.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -23,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CanvasRenderingContext_h -#define CanvasRenderingContext_h +#pragma once #include "GraphicsLayer.h" #include "HTMLCanvasElement.h" @@ -47,22 +46,21 @@ class CanvasRenderingContext : public ScriptWrappable { public: virtual ~CanvasRenderingContext() { } - void ref() { m_canvas->ref(); } - void deref() { m_canvas->deref(); } - HTMLCanvasElement* canvas() const { return m_canvas; } + void ref() { m_canvas.ref(); } + void deref() { m_canvas.deref(); } + HTMLCanvasElement& canvas() const { return m_canvas; } virtual bool is2d() const { return false; } - virtual bool is3d() const { return false; } + virtual bool isWebGL1() const { return false; } + virtual bool isWebGL2() const { return false; } + bool is3d() const { return isWebGL1() || isWebGL2(); } virtual bool isAccelerated() const { return false; } virtual void paintRenderingResultsToCanvas() {} - -#if USE(ACCELERATED_COMPOSITING) virtual PlatformLayer* platformLayer() const { return 0; } -#endif protected: - CanvasRenderingContext(HTMLCanvasElement*); + CanvasRenderingContext(HTMLCanvasElement&); bool wouldTaintOrigin(const CanvasPattern*); bool wouldTaintOrigin(const HTMLCanvasElement*); bool wouldTaintOrigin(const HTMLImageElement*); @@ -72,15 +70,17 @@ protected: template<class T> void checkOrigin(const T* arg) { if (wouldTaintOrigin(arg)) - canvas()->setOriginTainted(); + canvas().setOriginTainted(); } void checkOrigin(const URL&); private: - HTMLCanvasElement* m_canvas; - HashSet<String> m_cleanURLs; + HTMLCanvasElement& m_canvas; }; } // namespace WebCore -#endif +#define SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(ToValueTypeName, predicate) \ +SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \ + static bool isType(const WebCore::CanvasRenderingContext& context) { return context.predicate; } \ +SPECIALIZE_TYPE_TRAITS_END() |