diff options
author | John Reck <jreck@google.com> | 2011-12-13 13:16:40 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-13 13:16:40 -0800 |
commit | 599c05f3080acd1c99f4d925c333d8a2711c9bdf (patch) | |
tree | 63716bef06e7654fe8af18140d5135043d293c71 /Source/WebCore/rendering/RenderHTMLCanvas.cpp | |
parent | c52e5656adae84b9be8d0e10f0e68bfca988fe9a (diff) | |
parent | c25e44371cee46d5ba925ef59b9af726cbbc6480 (diff) | |
download | external_webkit-599c05f3080acd1c99f4d925c333d8a2711c9bdf.zip external_webkit-599c05f3080acd1c99f4d925c333d8a2711c9bdf.tar.gz external_webkit-599c05f3080acd1c99f4d925c333d8a2711c9bdf.tar.bz2 |
Merge "Revert "Put canvas on a layer"" into ics-mr1
Diffstat (limited to 'Source/WebCore/rendering/RenderHTMLCanvas.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderHTMLCanvas.cpp | 6 |
1 files changed, 1 insertions, 5 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(); } |