diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-03-16 17:26:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 17:26:52 -0700 |
| commit | f98d9049e5d638ff31a3e13316fc5a5fc7446332 (patch) | |
| tree | 2e8557d1cb92363223a684fa8f0e0db5e67c1318 /WebKit | |
| parent | 114ea00b345ca2696f097bc1ee69a196be11e4a1 (diff) | |
| parent | 9863c30dfa5b5a03577c0ad069bb04d70435ac2d (diff) | |
| download | external_webkit-f98d9049e5d638ff31a3e13316fc5a5fc7446332.zip external_webkit-f98d9049e5d638ff31a3e13316fc5a5fc7446332.tar.gz external_webkit-f98d9049e5d638ff31a3e13316fc5a5fc7446332.tar.bz2 | |
am 9863c30d: Merge "Fix page jump after clicking links in nytimes.com" into honeycomb-mr1
* commit '9863c30dfa5b5a03577c0ad069bb04d70435ac2d':
Fix page jump after clicking links in nytimes.com
Diffstat (limited to 'WebKit')
| -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(); } |