diff options
| author | Cary Clark <cary@android.com> | 2010-12-15 04:57:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-15 04:57:30 -0800 |
| commit | 052fc207e3b0c145df08f85c14a7946b5ae3b79f (patch) | |
| tree | 0cafe512b96e7935a8172ba514cab53c38c44105 /WebKit/android/nav/SelectText.h | |
| parent | c7911ffd666a7e73131dfd68919b769086a093e0 (diff) | |
| parent | d2966aa787e0dcc4d26a10b6f0dc9f3a2f51abe4 (diff) | |
| download | external_webkit-052fc207e3b0c145df08f85c14a7946b5ae3b79f.zip external_webkit-052fc207e3b0c145df08f85c14a7946b5ae3b79f.tar.gz external_webkit-052fc207e3b0c145df08f85c14a7946b5ae3b79f.tar.bz2 | |
Merge "improve text selection"
Diffstat (limited to 'WebKit/android/nav/SelectText.h')
| -rw-r--r-- | WebKit/android/nav/SelectText.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebKit/android/nav/SelectText.h b/WebKit/android/nav/SelectText.h index 32e1728..666cdd1 100644 --- a/WebKit/android/nav/SelectText.h +++ b/WebKit/android/nav/SelectText.h @@ -60,8 +60,17 @@ public: int m_selectX; int m_selectY; private: + class FirstCheck; + class EdgeCheck; void drawSelectionPointer(SkCanvas* , IntRect* ); void drawSelectionRegion(SkCanvas* , IntRect* ); + SkIRect findClosest(FirstCheck& , const SkPicture& , int* base); + SkIRect findEdge(const SkPicture& , const SkIRect& area, + int x, int y, bool left, int* base); + SkIRect findLeft(const SkPicture& picture, const SkIRect& area, + int x, int y, int* base); + SkIRect findRight(const SkPicture& picture, const SkIRect& area, + int x, int y, int* base); static void getSelectionArrow(SkPath* ); void getSelectionCaret(SkPath* ); bool hitCorner(int cx, int cy, int x, int y) const; @@ -73,6 +82,7 @@ private: SkIRect m_selEnd; SkIRect m_lastStart; SkIRect m_lastEnd; + SkIRect m_wordBounds; int m_startBase; int m_endBase; int m_layerId; @@ -86,6 +96,8 @@ private: bool m_flipped; bool m_hitTopLeft; bool m_startSelection; + bool m_wordSelection; + bool m_outsideWord; }; } |