diff options
| author | Cary Clark <cary@android.com> | 2009-12-04 10:29:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 10:29:57 -0800 |
| commit | 021228f27b1399df5a45f3f1e7f1f12126e86e3c (patch) | |
| tree | 5e127bc6852405eb389fcc3779a9e10caf6dec9a /WebKit/android/nav/CachedRoot.cpp | |
| parent | 460d4fa19ac597fe27cc530c2a1ce0ca459cef35 (diff) | |
| parent | 1d330120b6c2ee2d3f1c25300d0e3d446ef8c640 (diff) | |
| download | external_webkit-021228f27b1399df5a45f3f1e7f1f12126e86e3c.zip external_webkit-021228f27b1399df5a45f3f1e7f1f12126e86e3c.tar.gz external_webkit-021228f27b1399df5a45f3f1e7f1f12126e86e3c.tar.bz2 | |
am 1d330120: move input-related fields out of CachedNode to expand
Merge commit '1d330120b6c2ee2d3f1c25300d0e3d446ef8c640' into eclair-mr2-plus-aosp
* commit '1d330120b6c2ee2d3f1c25300d0e3d446ef8c640':
move input-related fields out of CachedNode to expand
Diffstat (limited to 'WebKit/android/nav/CachedRoot.cpp')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 5bb2b19..83e2ab6 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -844,9 +844,9 @@ int CachedRoot::getBlockLeftEdge(int x, int y, float scale) const const CachedFrame* frame; int fx, fy; const CachedNode* node = findAt(rect, &frame, &fx, &fy, true); - if (node && (node->isTextArea() || node->isTextField() || node->isPlugin())) { + if (node && node->wantsKeyEvents()) { DBG_NAV_LOGD("x=%d (%s)", node->bounds().x(), - node->isTextArea() || node->isTextField() ? "text" : "plugin"); + node->isTextInput() ? "text" : "plugin"); return node->bounds().x(); } int halfW = (int) (mViewBounds.width() * scale * 0.5f); |