diff options
author | John Reck <jreck@google.com> | 2012-05-17 21:11:23 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-17 21:11:23 -0700 |
commit | fd5698006bcb9182415182cc825a4b4949167d05 (patch) | |
tree | 618ca0dfe4f8262f1487382906d3246067fa490f | |
parent | 4b0853e65bc347632bd7b2d8ea77add39117db43 (diff) | |
parent | 1e59a334a1203c7be3fff2f9dbf94fee5b879d20 (diff) | |
download | external_webkit-fd5698006bcb9182415182cc825a4b4949167d05.zip external_webkit-fd5698006bcb9182415182cc825a4b4949167d05.tar.gz external_webkit-fd5698006bcb9182415182cc825a4b4949167d05.tar.bz2 |
am 1e59a334: Make sure CanvasLayer isn\'t merged and is initialized correctly
* commit '1e59a334a1203c7be3fff2f9dbf94fee5b879d20':
Make sure CanvasLayer isn't merged and is initialized correctly
3 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp b/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp index 93806ff..4a7f161 100644 --- a/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp +++ b/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp @@ -52,6 +52,8 @@ CanvasLayer::CanvasLayer(RenderLayer* owner, HTMLCanvasElement* canvas) { init(); m_canvas->addObserver(this); + // Make sure we initialize in case the canvas has already been laid out + canvasResized(m_canvas); } CanvasLayer::CanvasLayer(const CanvasLayer& layer) diff --git a/Source/WebCore/platform/graphics/android/layers/CanvasLayer.h b/Source/WebCore/platform/graphics/android/layers/CanvasLayer.h index c719451..fce6453 100644 --- a/Source/WebCore/platform/graphics/android/layers/CanvasLayer.h +++ b/Source/WebCore/platform/graphics/android/layers/CanvasLayer.h @@ -52,6 +52,7 @@ public: virtual bool drawGL(bool layerTilesDisabled); virtual void contentDraw(SkCanvas* canvas, PaintStyle style); virtual bool needsTexture(); + virtual bool needsIsolatedSurface() { return true; } protected: virtual InvalidateFlags onSetHwAccelerated(bool hwAccelerated); diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h index 52df0cf..9b239ee 100644 --- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h @@ -281,7 +281,7 @@ public: Surface* surface() { return m_surface; } void setIntrinsicallyComposited(bool intCom) { m_intrinsicallyComposited = intCom; } - bool needsIsolatedSurface() { + virtual bool needsIsolatedSurface() { return (needsTexture() && m_intrinsicallyComposited) || m_animations.size(); } |