diff options
| author | John Reck <jreck@google.com> | 2011-12-13 13:18:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-13 13:18:39 -0800 |
| commit | f912aaa3c8084eccb0f5fcb74606063d9ce5c74b (patch) | |
| tree | 63716bef06e7654fe8af18140d5135043d293c71 | |
| parent | a6335830bdd828bd9d67a6209b0ba74b28e12e34 (diff) | |
| parent | 599c05f3080acd1c99f4d925c333d8a2711c9bdf (diff) | |
| download | external_webkit-f912aaa3c8084eccb0f5fcb74606063d9ce5c74b.zip external_webkit-f912aaa3c8084eccb0f5fcb74606063d9ce5c74b.tar.gz external_webkit-f912aaa3c8084eccb0f5fcb74606063d9ce5c74b.tar.bz2 | |
am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1
* commit '599c05f3080acd1c99f4d925c333d8a2711c9bdf':
Revert "Put canvas on a layer"
| -rw-r--r-- | Source/WebCore/rendering/RenderHTMLCanvas.cpp | 6 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebCore/rendering/RenderHTMLCanvas.cpp b/Source/WebCore/rendering/RenderHTMLCanvas.cpp index ada79e9..de2a2c1 100644 --- a/Source/WebCore/rendering/RenderHTMLCanvas.cpp +++ b/Source/WebCore/rendering/RenderHTMLCanvas.cpp @@ -47,13 +47,9 @@ RenderHTMLCanvas::RenderHTMLCanvas(HTMLCanvasElement* element) bool RenderHTMLCanvas::requiresLayer() const { -#if PLATFORM(ANDROID) - return true; -#endif - if (RenderReplaced::requiresLayer()) return true; - + HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(node()); return canvas && canvas->renderingContext() && canvas->renderingContext()->isAccelerated(); } diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index 06fa0f6..1ef3b77 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -1384,8 +1384,6 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye if (layer->isFixed()) return true; #endif - if (layer->renderer()->isCanvas()) - return true; return false; } #endif |