Changeset 173542 in webkit

Timestamp:

Sep 11, 2014, 3:08:54 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Roll out r173450. <rdar://problem/17629840>

Location:

branches/safari-600.1.4.11-branch/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)

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

@@ +1 @@
+2014-09-11  Babak Shafiei  <bshafiei@apple.com>
+
+        Roll out r173450.
+
 2014-09-10  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp

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

branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h

@@ -41 +41 @@
         , isSelectable(false)
         , isNearMarkedText(false)
-        , touchCalloutEnabled(true)
     {
     }
@@ -49 +48 @@
     bool isSelectable;
     bool isNearMarkedText;
-    bool touchCalloutEnabled;
     String clickableElementName;
     String url;

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

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

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

@@ -1899 +1899 @@
             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();
-            }
         }
     }