Clip selected text within scrollable edit to the edit boundary.

 Bug 6666415

Change-Id: Ie19e6bc3eedcbb5c9eb5791ac4b1f55149dcdb72

2 files changed, 9 insertions, 2 deletions

diff --git a/Source/WebKit/android/nav/DrawExtra.cpp b/Source/WebKit/android/nav/DrawExtra.cpp
index 2f57dc1..a7d686c 100644
--- a/Source/WebKit/android/nav/DrawExtra.cpp
+++ b/Source/WebKit/android/nav/DrawExtra.cpp
@@ -52,7 +52,8 @@ SkRegion* RegionLayerDrawExtra::getHighlightRegionsForLayer(const LayerAndroid*
 }
 
 void RegionLayerDrawExtra::addHighlightRegion(const LayerAndroid* layer, const Vector<IntRect>& rects,
-                                              const IntPoint& additionalOffset)
+                                              const IntPoint& additionalOffset,
+                                              const IntRect& clipRect)
 {
     if (rects.isEmpty())
         return;
@@ -66,6 +67,11 @@ void RegionLayerDrawExtra::addHighlightRegion(const LayerAndroid* layer, const V
     WebViewCore::layerToAbsoluteOffset(layer, offset);
     for (size_t i = 0; i < rects.size(); i++) {
         IntRect r = rects.at(i);
+        if (!clipRect.isEmpty()) {
+            r.intersect(clipRect);
+            if (r.isEmpty())
+                continue; // don't add it to the region
+        }
         r.move(-offset.x(), -offset.y());
         region->op(r.x(), r.y(), r.maxX(), r.maxY(), SkRegion::kUnion_Op);
     }
diff --git a/Source/WebKit/android/nav/DrawExtra.h b/Source/WebKit/android/nav/DrawExtra.h
index cc94476..1850b6b 100644
--- a/Source/WebKit/android/nav/DrawExtra.h
+++ b/Source/WebKit/android/nav/DrawExtra.h
@@ -65,7 +65,8 @@ public:
     virtual ~RegionLayerDrawExtra();
 
     void addHighlightRegion(const LayerAndroid* layer, const Vector<IntRect>& rects,
-                            const IntPoint& additionalOffset = IntPoint());
+                            const IntPoint& additionalOffset = IntPoint(),
+                            const IntRect& clipRect = IntRect());
     virtual void draw(SkCanvas*, LayerAndroid*);
     virtual void drawGL(GLExtras*, const LayerAndroid*);