Changeset 173450 in webkit

Timestamp:

Sep 9, 2014, 4:16:55 PM (12 years ago)

Author:

enrica@apple.com

Message:

REGRESSION (WebKit2): -webkit-touch-callout: none has no effect.
​https://bugs.webkit.org/show_bug.cgi?id=136685
rdar://problem/17629840

Reviewed by Benjamin Poulain.

We need to check if the touch callout is enabled for the element before starting
the long press gesture.
The information about the touch callout is returned together with the rest of data
returned by the InteractionInformationAtPosition.

• Shared/InteractionInformationAtPosition.cpp:

(WebKit::InteractionInformationAtPosition::encode):
(WebKit::InteractionInformationAtPosition::decode):

• Shared/InteractionInformationAtPosition.h:

(WebKit::InteractionInformationAtPosition::InteractionInformationAtPosition):

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _actionForLongPress]):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::getPositionInformation):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/InteractionInformationAtPosition.cpp (modified) (2 diffs)
• Shared/InteractionInformationAtPosition.h (modified) (2 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-09-09  Enrica Casucci  <enrica@apple.com>
+
+        REGRESSION (WebKit2): -webkit-touch-callout: none has no effect.
+        https://bugs.webkit.org/show_bug.cgi?id=136685
+        rdar://problem/17629840
+
+        Reviewed by Benjamin Poulain.
+
+        We need to check if the touch callout is enabled for the element before starting
+        the long press gesture.
+        The information about the touch callout is returned together with the rest of data
+        returned by the InteractionInformationAtPosition.
+
+        * Shared/InteractionInformationAtPosition.cpp:
+        (WebKit::InteractionInformationAtPosition::encode):
+        (WebKit::InteractionInformationAtPosition::decode):
+        * Shared/InteractionInformationAtPosition.h:
+        (WebKit::InteractionInformationAtPosition::InteractionInformationAtPosition):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _actionForLongPress]):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::getPositionInformation):
+
 2014-09-09  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp

@@ -39 +39 @@
     encoder << isSelectable;
     encoder << isNearMarkedText;
+    encoder << touchCalloutEnabled;
     encoder << clickableElementName;
     encoder << url;
@@ -64 +65 @@
         return false;
 
+    if (!decoder.decode(result.touchCalloutEnabled))
+        return false;
+    
     if (!decoder.decode(result.clickableElementName))
         return false;

trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h

@@ -44 +44 @@
         , isSelectable(false)
         , isNearMarkedText(false)
+        , touchCalloutEnabled(true)
     {
     }
@@ -51 +52 @@
     bool isSelectable;
     bool isNearMarkedText;
+    bool touchCalloutEnabled;
     String clickableElementName;
     String url;

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -783 +783 @@
 - (SEL)_actionForLongPress
 {
+    if (!_positionInformation.touchCalloutEnabled)
+        return nil;
+
     if (_positionInformation.clickableElementName == "IMG")
         return @selector(_showImageSheet);

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1906 +1906 @@
             if (linkElement && info.title.isEmpty())
                 info.title = element->innerText();
-            if (element->renderer())
+            if (element->renderer()) {
                 info.bounds = element->renderer()->absoluteBoundingBoxRect(true);
+                info.touchCalloutEnabled = element->renderer()->style().touchCalloutEnabled();
+            }
         }
     }