diff options
| author | Cary Clark <cary@android.com> | 2009-12-07 18:32:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 18:32:10 -0800 |
| commit | c5722d49df912077f26c29cf480007ba158bd308 (patch) | |
| tree | a49468f9c3db0125f686f85ef3d206c3df7da44d /WebKit/android | |
| parent | 79b4ba1c1229e9fe893bc888545f23174a35ba04 (diff) | |
| parent | 9a00fbd61c8699856620bca057e06efca4425015 (diff) | |
| download | external_webkit-c5722d49df912077f26c29cf480007ba158bd308.zip external_webkit-c5722d49df912077f26c29cf480007ba158bd308.tar.gz external_webkit-c5722d49df912077f26c29cf480007ba158bd308.tar.bz2 | |
am 9a00fbd6: am 34bca311: fix crash reading readonly node state
Merge commit '9a00fbd61c8699856620bca057e06efca4425015'
* commit '9a00fbd61c8699856620bca057e06efca4425015':
fix crash reading readonly node state
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index c98da73..7a9dbcd 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -921,15 +921,15 @@ bool motionUp(int x, int y, int slop) bool syntheticLink = result->isSyntheticLink(); if (!syntheticLink) { sendMotionUp( - frame ? (WebCore::Frame*) frame->framePointer() : 0, - result ? (WebCore::Node*) result->nodePointer() : 0, rx, ry); + (WebCore::Frame*) frame->framePointer(), + (WebCore::Node*) result->nodePointer(), rx, ry); } viewInvalidate(); if (result->isTextInput()) { + bool isReadOnly = frame->textInput(result)->isReadOnly(); rebuildWebTextView(true); - if (!frame->textInput(result)->isReadOnly()) { + if (!isReadOnly) displaySoftKeyboard(true); - } } else { clearTextEntry(); setFollowedLink(true); |