summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2010-02-26 14:44:28 -0500
committerMike Reed <reed@google.com>2010-02-26 14:44:28 -0500
commita72964908d18b6749473e7426e32da408a480f00 (patch)
treed70a1d2ffd5fe43d38800ef578a9ce576df3c3a5 /WebCore
parentd3376c33807e25bd5b6328a0ced9cd25b0eb6f20 (diff)
downloadexternal_webkit-a72964908d18b6749473e7426e32da408a480f00.zip
external_webkit-a72964908d18b6749473e7426e32da408a480f00.tar.gz
external_webkit-a72964908d18b6749473e7426e32da408a480f00.tar.bz2
ignore rootlayer when drawing (fixes regression)
dump layers contents in displayTree.txt
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 9bd5a78..9d5d1ec 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -295,9 +295,6 @@ void LayerAndroid::onDraw(SkCanvas* canvas, SkScalar opacity) {
canvas->clipRect(r);
}
- if (!m_isRootLayer)
- return;
-
if (!prepareContext())
return;
@@ -456,6 +453,11 @@ void LayerAndroid::dumpLayers(FILE* file, int indentLevel) const
writeIntVal(file, indentLevel + 1, "fixedWidth", m_fixedWidth);
writeIntVal(file, indentLevel + 1, "fixedHeight", m_fixedHeight);
+ if (m_recordingPicture) {
+ writeIntVal(file, indentLevel + 1, "picture width", m_recordingPicture->width());
+ writeIntVal(file, indentLevel + 1, "picture height", m_recordingPicture->height());
+ }
+
if (countChildren()) {
writeln(file, indentLevel + 1, "children = [");
for (int i = 0; i < countChildren(); i++) {