diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h b/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h index ed3a06f..cb2ccc9 100644 --- a/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h +++ b/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h @@ -43,9 +43,9 @@ class CanvasLayerChromium : public LayerChromium { public: virtual ~CanvasLayerChromium(); - virtual void draw(); + virtual PassRefPtr<CCLayerImpl> createCCLayerImpl(); - typedef ProgramBinding<VertexShaderPosTex, FragmentShaderRGBATexFlipAlpha> Program; + virtual void pushPropertiesTo(CCLayerImpl*); protected: explicit CanvasLayerChromium(GraphicsLayerChromium* owner); @@ -55,9 +55,6 @@ protected: bool m_textureChanged; unsigned m_textureId; bool m_premultipliedAlpha; - -private: - static unsigned m_shaderProgramId; }; } |