summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav/SelectText.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-09-27 20:15:22 -0700
committerJohn Reck <jreck@google.com>2011-09-28 10:59:43 -0700
commit62740ff35119cc54e82b6af582a01dd34b9e027e (patch)
tree27cb0b34b112331512a86a3612e7d19b23cc5e3a /Source/WebKit/android/nav/SelectText.h
parent494b1214559a0b6ddeff8e9b3eebc7f22cb2e951 (diff)
downloadexternal_webkit-62740ff35119cc54e82b6af582a01dd34b9e027e.zip
external_webkit-62740ff35119cc54e82b6af582a01dd34b9e027e.tar.gz
external_webkit-62740ff35119cc54e82b6af582a01dd34b9e027e.tar.bz2
Don't scale text selection handles
Bug: 5367280 Don't scale the old software handle and, more importantly, don't scale the touch target. Change-Id: I9a731b2117b3f2fe3bd6ca35388da61c47724d91
Diffstat (limited to 'Source/WebKit/android/nav/SelectText.h')
-rw-r--r--Source/WebKit/android/nav/SelectText.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/SelectText.h b/Source/WebKit/android/nav/SelectText.h
index 272cfd1..b1e1f11 100644
--- a/Source/WebKit/android/nav/SelectText.h
+++ b/Source/WebKit/android/nav/SelectText.h
@@ -58,11 +58,14 @@ public:
bool startSelection(const CachedRoot* , const IntRect& vis, int x, int y);
bool wordSelection(const CachedRoot* , const IntRect& vis, int x, int y);
void getSelectionRegion(const IntRect& vis, SkRegion *region);
+ void updateHandleScale(float handleScale);
public:
float m_inverseScale; // inverse scale, x, y used for drawing select path
int m_selectX;
int m_selectY;
private:
+ int m_controlWidth;
+ int m_controlHeight;
class FirstCheck;
class EdgeCheck;
void drawSelectionPointer(SkCanvas* , IntRect* );
@@ -77,6 +80,8 @@ private:
static void getSelectionArrow(SkPath* );
void getSelectionCaret(SkPath* );
bool hitCorner(int cx, int cy, int x, int y) const;
+ bool hitStartHandle(int x, int y) const;
+ bool hitEndHandle(int x, int y) const;
void setVisibleRect(const IntRect& );
void swapAsNeeded();
SkIPoint m_original; // computed start of extend selection