diff options
| author | Mike Reed <reed@google.com> | 2010-02-26 11:46:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-26 11:46:15 -0800 |
| commit | bd176981556f55a8f081b8ee6c804a384deb9644 (patch) | |
| tree | 29077d132a9c6cf04ca2ccc376c7d1f95e2c6b39 /WebCore | |
| parent | 2a08ec52b929d53cec8a3529ed5e2d740aabad59 (diff) | |
| parent | a72964908d18b6749473e7426e32da408a480f00 (diff) | |
| download | external_webkit-bd176981556f55a8f081b8ee6c804a384deb9644.zip external_webkit-bd176981556f55a8f081b8ee6c804a384deb9644.tar.gz external_webkit-bd176981556f55a8f081b8ee6c804a384deb9644.tar.bz2 | |
Merge "ignore rootlayer when drawing (fixes regression) dump layers contents in displayTree.txt"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 8 |
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++) { |