diff options
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.h | 3 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.h b/Source/WebCore/rendering/RenderLayerBacking.h index f1b8972..9e68209 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.h +++ b/Source/WebCore/rendering/RenderLayerBacking.h @@ -59,6 +59,9 @@ public: RenderLayerBacking(RenderLayer*); ~RenderLayerBacking(); +#if PLATFORM(ANDROID) + virtual +#endif RenderLayer* owningLayer() const { return m_owningLayer; } enum UpdateDepth { CompositingChildren, AllDescendants }; diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index 66dcf40..786f806 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -1520,15 +1520,6 @@ bool RenderLayerCompositor::needsContentsCompositingLayer(const RenderLayer* lay bool RenderLayerCompositor::requiresScrollLayer(RootLayerAttachment attachment) const { -#if PLATFORM(ANDROID) - // Recently, RenderLayerCompositor is changed to be a subclass of - // GraphicsLayerClient, and it is used for iframe. - // http://trac.webkit.org/changeset/75262 - // We have our own support for iframe, before we embrace this new approach, - // we will disable it. - // TODO: Investigate how to utilize this way to support iframe. - return false; -#endif // We need to handle our own scrolling if we're: return !m_renderView->frameView()->platformWidget() // viewless (i.e. non-Mac, or Mac in WebKit2) || attachment == RootLayerAttachedViaEnclosingFrame; // a composited frame on Mac |