diff options
| author | Cary Clark <cary@android.com> | 2010-11-05 14:17:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-05 14:17:11 +0000 |
| commit | 665f41f7fcded45d387e2d23d5ae81f5f9acb17d (patch) | |
| tree | c28c726a09221cce49b5b4456c350a80fb135108 /WebCore | |
| parent | f27fc812b6f9c8e44806849bdf68f6e5399f3081 (diff) | |
| parent | 527fb7b2ce688a9d6731ecee454005918a4b966e (diff) | |
| download | external_webkit-665f41f7fcded45d387e2d23d5ae81f5f9acb17d.zip external_webkit-665f41f7fcded45d387e2d23d5ae81f5f9acb17d.tar.gz external_webkit-665f41f7fcded45d387e2d23d5ae81f5f9acb17d.tar.bz2 | |
Merge "Adjust layers when parent layer scrolls"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index 5210171..f88401c 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -342,10 +342,12 @@ void LayerAndroid::findInner(LayerAndroidFindState& state) const bounds(&localBounds); if (!localBounds.contains(x, y)) return; - if (!m_recordingPicture) - return; - if (!state.drew(m_recordingPicture, localBounds)) - return; + if (!m_foregroundPicture) { + if (!m_recordingPicture) + return; + if (!state.drew(m_recordingPicture, localBounds)) + return; + } state.setBest(this); // set last match (presumably on top) } @@ -688,8 +690,19 @@ void LayerAndroid::dumpLayers(FILE* file, int indentLevel) const } if (m_recordingPicture) { - writeIntVal(file, indentLevel + 1, "picture width", m_recordingPicture->width()); - writeIntVal(file, indentLevel + 1, "picture height", m_recordingPicture->height()); + writeIntVal(file, indentLevel + 1, "m_recordingPicture.width", m_recordingPicture->width()); + writeIntVal(file, indentLevel + 1, "m_recordingPicture.height", m_recordingPicture->height()); + } + + if (m_foregroundPicture) { + writeIntVal(file, indentLevel + 1, "m_foregroundPicture.width", m_foregroundPicture->width()); + writeIntVal(file, indentLevel + 1, "m_foregroundPicture.height", m_foregroundPicture->height()); + writeFloatVal(file, indentLevel + 1, "m_foregroundClip.fLeft", m_foregroundClip.fLeft); + writeFloatVal(file, indentLevel + 1, "m_foregroundClip.fTop", m_foregroundClip.fTop); + writeFloatVal(file, indentLevel + 1, "m_foregroundClip.fRight", m_foregroundClip.fRight); + writeFloatVal(file, indentLevel + 1, "m_foregroundClip.fBottom", m_foregroundClip.fBottom); + writeFloatVal(file, indentLevel + 1, "m_foregroundLocation.fX", m_foregroundLocation.fX); + writeFloatVal(file, indentLevel + 1, "m_foregroundLocation.fY", m_foregroundLocation.fY); } if (countChildren()) { |