diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-03-16 17:31:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 17:31:35 -0700 |
| commit | 657a5f2db10dce43b6d27ce6cfa927ecd1f931ff (patch) | |
| tree | 4e93e6c37962de9ddd75b726ff9b7d8a7bc80f8b | |
| parent | df18bcda73437f0690129e4915d0c55b62dc9458 (diff) | |
| parent | f98d9049e5d638ff31a3e13316fc5a5fc7446332 (diff) | |
| download | external_webkit-657a5f2db10dce43b6d27ce6cfa927ecd1f931ff.zip external_webkit-657a5f2db10dce43b6d27ce6cfa927ecd1f931ff.tar.gz external_webkit-657a5f2db10dce43b6d27ce6cfa927ecd1f931ff.tar.bz2 | |
am f98d9049: am 9863c30d: Merge "Fix page jump after clicking links in nytimes.com" into honeycomb-mr1
* commit 'f98d9049e5d638ff31a3e13316fc5a5fc7446332':
Fix page jump after clicking links in nytimes.com
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index ca28932..013972a 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -90,6 +90,8 @@ void ChromeClientAndroid::attachRootGraphicsLayer(WebCore::Frame*, WebCore::Grap { // frame is not used in Android as we should only get root graphics layer for the main frame m_rootGraphicsLayer = layer; + if (!layer) + return; scheduleCompositingLayerSync(); } |