diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 14:33:32 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:51 +0100 |
| commit | 5af96e2c7b73ebc627c6894727826a7576d31758 (patch) | |
| tree | f9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/platform/graphics/chromium/LayerRendererChromium.h | |
| parent | 8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff) | |
| download | external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2 | |
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/platform/graphics/chromium/LayerRendererChromium.h')
| -rw-r--r-- | WebCore/platform/graphics/chromium/LayerRendererChromium.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.h b/WebCore/platform/graphics/chromium/LayerRendererChromium.h index 498678e..eb66dac 100644 --- a/WebCore/platform/graphics/chromium/LayerRendererChromium.h +++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.h @@ -69,6 +69,10 @@ public: bool hardwareCompositing() const { return m_hardwareCompositing; } + void setRootLayerCanvasSize(const IntSize&); + + GraphicsContext* rootLayerGraphicsContext() const { return m_rootLayerGraphicsContext.get(); } + private: void compositeLayersRecursive(LayerChromium*, const TransformationMatrix&, float opacity, const IntRect& visibleRect); @@ -124,6 +128,13 @@ private: typedef HashMap<LayerChromium*, unsigned int> TextureIdMap; TextureIdMap m_textureIdMap; +#if PLATFORM(SKIA) + OwnPtr<skia::PlatformCanvas> m_rootLayerCanvas; + OwnPtr<PlatformContextSkia> m_rootLayerSkiaContext; + OwnPtr<GraphicsContext> m_rootLayerGraphicsContext; +#endif + IntSize m_rootLayerCanvasSize; + OwnPtr<GLES2Context> m_gles2Context; // The WebCore Page that the compositor renders into. |