diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-01-04 11:41:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-04 11:41:10 -0800 |
| commit | 870689c8f0b388ea29f06a711f09258d910cf0ff (patch) | |
| tree | 97f62cc64e391bde4a9436791e844dda7ed3f76a /WebCore/rendering | |
| parent | 66367cf8feab200c0ed1d18e52f9eab21c80cea0 (diff) | |
| parent | 9acd586e4a0aa54e4f630665aa0d3c8c95b78e72 (diff) | |
| download | external_webkit-870689c8f0b388ea29f06a711f09258d910cf0ff.zip external_webkit-870689c8f0b388ea29f06a711f09258d910cf0ff.tar.gz external_webkit-870689c8f0b388ea29f06a711f09258d910cf0ff.tar.bz2 | |
am 9acd586e: webkit layers support
Merge commit '9acd586e4a0aa54e4f630665aa0d3c8c95b78e72' into eclair-mr2-plus-aosp
* commit '9acd586e4a0aa54e4f630665aa0d3c8c95b78e72':
webkit layers support
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderLayerBacking.cpp | 2 | ||||
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp index a62c1be..35aa7e1 100644 --- a/WebCore/rendering/RenderLayerBacking.cpp +++ b/WebCore/rendering/RenderLayerBacking.cpp @@ -1007,6 +1007,7 @@ void RenderLayerBacking::paintIntoLayer(RenderLayer* rootLayer, GraphicsContext* ASSERT(!m_owningLayer->m_usedTransparency); } +#if ENABLE(INSPECTOR) static InspectorTimelineAgent* inspectorTimelineAgent(RenderObject* renderer) { Frame* frame = renderer->document()->frame(); @@ -1017,6 +1018,7 @@ static InspectorTimelineAgent* inspectorTimelineAgent(RenderObject* renderer) return 0; return page->inspectorTimelineAgent(); } +#endif // Up-call from compositing layer drawing callback. void RenderLayerBacking::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect& clip) diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index 2f5e267..8ce59cb 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -891,6 +891,10 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c requiresCompositingForVideo(layer->renderer()) || requiresCompositingForCanvas(layer->renderer()) || layer->renderer()->style()->backfaceVisibility() == BackfaceVisibilityHidden || +#if PLATFORM(ANDROID) + (layer->renderer()->isPositioned() && + layer->renderer()->style()->position() == FixedPosition) || +#endif clipsCompositingDescendants(layer) || requiresCompositingForAnimation(layer->renderer()); } @@ -1064,4 +1068,3 @@ bool RenderLayerCompositor::layerHas3DContent(const RenderLayer* layer) const } // namespace WebCore #endif // USE(ACCELERATED_COMPOSITING) - |