diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-04-06 15:16:28 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2012-04-24 11:54:25 -0700 |
| commit | a15d30f54c6edc68da7e82c198b5916dd023ac4d (patch) | |
| tree | 6f7040096043ac04a72600144a51a274f1096b2f /Source/WebCore/rendering/RenderLayerBacking.cpp | |
| parent | 492bcfac9fc25b61f44811050fb0cfe827eb6a08 (diff) | |
| download | external_webkit-a15d30f54c6edc68da7e82c198b5916dd023ac4d.zip external_webkit-a15d30f54c6edc68da7e82c198b5916dd023ac4d.tar.gz external_webkit-a15d30f54c6edc68da7e82c198b5916dd023ac4d.tar.bz2 | |
CSS Background image implementation
bug:1352305
Change-Id: Id9caaae9b9442729110b52c75004f634d8284db4
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerBacking.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index 6f56eca..c0c562a 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -1114,12 +1114,24 @@ void RenderLayerBacking::paintIntoLayer(RenderLayer* rootLayer, GraphicsContext* bool shouldPaint = (m_owningLayer->hasVisibleContent() || m_owningLayer->hasVisibleDescendant()) && m_owningLayer->isSelfPaintingLayer(); +#if PLATFORM(ANDROID) + if (shouldPaint && ((paintingPhase & GraphicsLayerPaintBackground) + || (paintingPhase & GraphicsLayerPaintBackgroundDecorations))) { +#else if (shouldPaint && (paintingPhase & GraphicsLayerPaintBackground)) { +#endif // Paint our background first, before painting any child layers. // Establish the clip used to paint our background. setClip(context, paintDirtyRect, damageRect); +#if PLATFORM(ANDROID) + PaintPhase phase = PaintPhaseBlockBackground; + if (paintingPhase & GraphicsLayerPaintBackgroundDecorations) + phase = PaintPhaseBlockBackgroundDecorations; + PaintInfo info(context, damageRect, phase, false, paintingRootForRenderer, 0); +#else PaintInfo info(context, damageRect, PaintPhaseBlockBackground, false, paintingRootForRenderer, 0); +#endif renderer()->paint(info, tx, ty); // Our scrollbar widgets paint exactly when we tell them to, so that they work properly with |