diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-01-04 20:25:48 +0000 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2010-01-04 20:25:48 +0000 |
| commit | 797e4f1087e408060f2812c79bddcd2b73a3830d (patch) | |
| tree | 988271e6c693cf3127a7ce0b5a16a2dcc7e61211 /WebCore/rendering | |
| parent | e035b64a686cf87a82d880d4863856231625b2f8 (diff) | |
| download | external_webkit-797e4f1087e408060f2812c79bddcd2b73a3830d.zip external_webkit-797e4f1087e408060f2812c79bddcd2b73a3830d.tar.gz external_webkit-797e4f1087e408060f2812c79bddcd2b73a3830d.tar.bz2 | |
resolved conflicts for merge of 870689c8
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) - |