Changeset 187299 in webkit

Timestamp:

Jul 23, 2015, 11:29:28 PM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r187117. rdar://problem/21921061

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-23  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187117
+
+    2015-07-21  Tim Horton  <timothy_horton@apple.com>
+
+            [iOS] Avoid using a TextIndicator if there are non-text things to indicate
+            https://bugs.webkit.org/show_bug.cgi?id=147152
+            <rdar://problem/21921061>
+
+            Reviewed by Beth Dakin.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::shouldUseTextIndicatorForLink):
+            (WebKit::WebPage::getPositionInformation):
+            Fall back to a rectangular area instead of a TextIndicator if there are any
+            non-inline elements inside the link.
+
 2015-07-23  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -3322 +3322 @@
     [_previewIndicatorView removeFromSuperview];
 
+    float deviceScaleFactor = _page->deviceScaleFactor();
+
     RefPtr<Image> image = _positionInformation.linkIndicator.contentImage;
     if (!image) {
-        [[viewController presentationController] setSourceRect:_positionInformation.bounds];
+        IntRect sourceRect = _positionInformation.bounds;
+        const float marginInPoints = 4;
+        sourceRect.inflate(marginInPoints * deviceScaleFactor);
+        [[viewController presentationController] setSourceRect:sourceRect];
         [[viewController presentationController] setSourceView:self];
         return;
@@ -3332 +3337 @@
     _previewIndicatorView = adoptNS([[UIImageView alloc] initWithImage:indicatorImage.get()]);
 
-    float deviceScaleFactor = _page->deviceScaleFactor();
     const float cornerRadiusInPoints = 5;
     Path path = PathUtilities::pathWithShrinkWrappedRects(_positionInformation.linkIndicator.textRectsInBoundingRectCoordinates, cornerRadiusInPoints * deviceScaleFactor);

branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -64 +64 @@
 #import <WebCore/HTMLElementTypeHelpers.h>
 #import <WebCore/HTMLFormElement.h>
+#import <WebCore/HTMLImageElement.h>
 #import <WebCore/HTMLInputElement.h>
 #import <WebCore/HTMLOptGroupElement.h>
@@ -2107 +2108 @@
 }
 
+static bool shouldUseTextIndicatorForLink(Element& element)
+{
+    if (element.renderer() && !element.renderer()->isInline())
+        return false;
+
+    for (auto& child : descendantsOfType<Element>(element)) {
+        if (child.renderer() && !child.renderer()->isInline())
+            return false;
+    }
+
+    return true;
+}
+
 void WebPage::getPositionInformation(const IntPoint& point, InteractionInformationAtPosition& info)
 {
@@ -2158 +2172 @@
                         info.image = snapshot->bitmap();
 
-                    RefPtr<Range> linkRange = rangeOfContents(*linkElement);
-                    if (linkRange) {
-                        float deviceScaleFactor = corePage()->deviceScaleFactor();
-                        const float marginInPoints = 4;
-                        RefPtr<TextIndicator> textIndicator = TextIndicator::createWithRange(*linkRange, TextIndicatorPresentationTransition::None, marginInPoints * deviceScaleFactor);
-                        if (textIndicator)
-                            info.linkIndicator = textIndicator->data();
+                    if (shouldUseTextIndicatorForLink(*linkElement)) {
+                        RefPtr<Range> linkRange = rangeOfContents(*linkElement);
+                        if (linkRange) {
+                            float deviceScaleFactor = corePage()->deviceScaleFactor();
+                            const float marginInPoints = 4;
+                            RefPtr<TextIndicator> textIndicator = TextIndicator::createWithRange(*linkRange, TextIndicatorPresentationTransition::None, marginInPoints * deviceScaleFactor);
+                            if (textIndicator)
+                                info.linkIndicator = textIndicator->data();
+                        }
                     }
                 } else if (element->renderer() && element->renderer()->isRenderImage()) {