summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-04-06 15:16:28 -0700
committerNicolas Roard <nicolasroard@google.com>2012-04-24 11:54:25 -0700
commita15d30f54c6edc68da7e82c198b5916dd023ac4d (patch)
tree6f7040096043ac04a72600144a51a274f1096b2f /Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
parent492bcfac9fc25b61f44811050fb0cfe827eb6a08 (diff)
downloadexternal_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/platform/graphics/android/layers/LayerAndroid.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
index a02759d..69c597f 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
@@ -578,9 +578,9 @@ void LayerAndroid::showLayer(int indent)
IntRect visible = visibleArea();
IntRect clip(m_clippingRect.x(), m_clippingRect.y(),
m_clippingRect.width(), m_clippingRect.height());
- ALOGD("%s %s (%d) [%d:0x%x] - %s %s - area (%d, %d, %d, %d) - visible (%d, %d, %d, %d) "
+ ALOGD("%s %s %s (%d) [%d:0x%x] - %s %s - area (%d, %d, %d, %d) - visible (%d, %d, %d, %d) "
"clip (%d, %d, %d, %d) %s %s m_content(%x), pic w: %d h: %d",
- spaces, subclassName().latin1().data(), subclassType(), uniqueId(), m_owningLayer,
+ spaces, m_haveClip ? "CLIP LAYER" : "", subclassName().ascii().data(), subclassType(), uniqueId(), m_owningLayer,
needsTexture() ? "needs a texture" : "no texture",
m_imageCRC ? "has an image" : "no image",
tr.x(), tr.y(), tr.width(), tr.height(),
@@ -748,6 +748,8 @@ IntRect LayerAndroid::unclippedArea()
IntRect LayerAndroid::visibleArea()
{
IntRect area = unclippedArea();
+ if (subclassType() == LayerAndroid::FixedBackgroundBaseLayer)
+ return area;
// First, we get the transformed area of the layer,
// in document coordinates
IntRect rect = m_drawTransform.mapRect(area);