diff options
| author | John Reck <jreck@google.com> | 2011-12-13 13:20:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-13 13:20:39 -0800 |
| commit | a73147edbc9b8ff7fa1c8d464de999b552463de8 (patch) | |
| tree | 0711604c3d61bf9b53418e461751babe1bbb9f5e /Source/WebCore/rendering | |
| parent | b512ad084ea8d33716606b347eab16e038b7e353 (diff) | |
| parent | f912aaa3c8084eccb0f5fcb74606063d9ce5c74b (diff) | |
| download | external_webkit-a73147edbc9b8ff7fa1c8d464de999b552463de8.zip external_webkit-a73147edbc9b8ff7fa1c8d464de999b552463de8.tar.gz external_webkit-a73147edbc9b8ff7fa1c8d464de999b552463de8.tar.bz2 | |
am f912aaa3: am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1
* commit 'f912aaa3c8084eccb0f5fcb74606063d9ce5c74b':
Revert "Put canvas on a layer"
Diffstat (limited to 'Source/WebCore/rendering')
| -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 |