diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-04 10:57:37 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-01-04 10:57:37 -0500 |
| commit | e035b64a686cf87a82d880d4863856231625b2f8 (patch) | |
| tree | a7959821f553721f475c5c245b72b14aec64c30b /WebKit/android/nav/CachedRoot.h | |
| parent | 15e893ab62ea591f85ca2506b5e81826b2a15e40 (diff) | |
| parent | 66367cf8feab200c0ed1d18e52f9eab21c80cea0 (diff) | |
| download | external_webkit-e035b64a686cf87a82d880d4863856231625b2f8.zip external_webkit-e035b64a686cf87a82d880d4863856231625b2f8.tar.gz external_webkit-e035b64a686cf87a82d880d4863856231625b2f8.tar.bz2 | |
resolved conflicts for merge of 66367cf8 to master
Diffstat (limited to 'WebKit/android/nav/CachedRoot.h')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebKit/android/nav/CachedRoot.h b/WebKit/android/nav/CachedRoot.h index 435937a..5fdf8df 100644 --- a/WebKit/android/nav/CachedRoot.h +++ b/WebKit/android/nav/CachedRoot.h @@ -52,11 +52,12 @@ public: void checkForJiggle(int* ) const; bool checkRings(const WTF::Vector<WebCore::IntRect>& rings, const WebCore::IntRect& bounds) const; - WebCore::IntPoint cursorLocation() const; // This method returns the desired ImeAction for the textfield where the - // mouse cursor currently is. If the mouse cursor is not on a textfield, + // mouse cursor currently is, or where the focus is if there is no mouse + // cursor. If the mouse cursor is not on a textfield, // it will return FAILURE - ImeAction cursorTextFieldAction() const; + ImeAction currentTextFieldAction() const; + WebCore::IntPoint cursorLocation() const; int documentHeight() { return mContents.height(); } int documentWidth() { return mContents.width(); } const CachedNode* findAt(const WebCore::IntRect& , const CachedFrame** , |