Changeset 160673 in webkit

Timestamp:

Dec 16, 2013 4:24:57 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

[WK2] Remove the constraint that highlight rects must be smaller than the scrollview bounds
​https://bugs.webkit.org/show_bug.cgi?id=125812

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-12-16
Reviewed by Dan Bernstein.

Currently, _scrollView is never set on WKInteractionView and all highlight rects are discarded.

Eventually, the constraint rect should be computed from the useful area of ScrollView and the scale
of the document. In the meantime, the constraint code is just causing troubles.

The issue is tracked by <rdar://problem/15673655>.

• UIProcess/API/ios/WKInteractionView.mm:

(-[WKInteractionView _didGetTapHighlightForRequest:color:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/ios/WKInteractionView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-16  Benjamin Poulain  <bpoulain@apple.com>
+
+        [WK2] Remove the constraint that highlight rects must be smaller than the scrollview bounds
+        https://bugs.webkit.org/show_bug.cgi?id=125812
+
+        Reviewed by Dan Bernstein.
+
+        Currently, _scrollView is never set on WKInteractionView and all highlight rects are discarded.
+
+        Eventually, the constraint rect should be computed from the useful area of ScrollView and the scale
+        of the document. In the meantime, the constraint code is just causing troubles.
+
+        The issue is tracked by <rdar://problem/15673655>.
+
+        * UIProcess/API/ios/WKInteractionView.mm:
+        (-[WKInteractionView _didGetTapHighlightForRequest:color:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):
+
 2013-12-16  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm

@@ -265 +265 @@
     [_highlightView.get() setColor:highlightUIKitColor.get()];
 
-    // Like WebKit1, we don't bother highlighting items that are bigger than the constraining rect.
-    // FIXME: this should not be done in mixed coordinate systems. It should be expressed in the ScrollView coordinates.
-    CGRect constrainRect = _scrollView.bounds;
-
     bool allHighlightRectsAreRectilinear = true;
     const size_t quadCount = highlightedQuads.size();
@@ -275 +271 @@
         const FloatQuad& quad = highlightedQuads[i];
         if (quad.isRectilinear()) {
-            CGRect rect = quad.boundingBox();
-            if ((CGRectGetWidth(rect) > CGRectGetWidth(constrainRect)) || (CGRectGetHeight(rect) > CGRectGetHeight(constrainRect)))
-                continue;
-
-            rect = CGRectInset(rect, -UIWebViewMinimumHighlightRadius, -UIWebViewMinimumHighlightRadius);
-            [rects.get() addObject:[NSValue valueWithCGRect:rect]];
+            CGRect rect = CGRectInset(quad.boundingBox(), -UIWebViewMinimumHighlightRadius, -UIWebViewMinimumHighlightRadius);
+            [rects addObject:[NSValue valueWithCGRect:rect]];
         } else {
             allHighlightRectsAreRectilinear = false;