Title: [173542] branches/safari-600.1.4.11-branch/Source/WebKit2
- Revision
- 173542
- Author
- [email protected]
- Date
- 2014-09-11 15:08:54 -0700 (Thu, 11 Sep 2014)
Log Message
Roll out r173450. <rdar://problem/17629840>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173541 => 173542)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-11 21:52:33 UTC (rev 173541)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-11 22:08:54 UTC (rev 173542)
@@ -1,3 +1,7 @@
+2014-09-11 Babak Shafiei <[email protected]>
+
+ Roll out r173450.
+
2014-09-10 Babak Shafiei <[email protected]>
Merge r173450.
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp (173541 => 173542)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2014-09-11 21:52:33 UTC (rev 173541)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2014-09-11 22:08:54 UTC (rev 173542)
@@ -38,7 +38,6 @@
encoder << nodeAtPositionIsAssistedNode;
encoder << isSelectable;
encoder << isNearMarkedText;
- encoder << touchCalloutEnabled;
encoder << clickableElementName;
encoder << url;
encoder << title;
@@ -64,9 +63,6 @@
if (!decoder.decode(result.isNearMarkedText))
return false;
- if (!decoder.decode(result.touchCalloutEnabled))
- return false;
-
if (!decoder.decode(result.clickableElementName))
return false;
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h (173541 => 173542)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2014-09-11 21:52:33 UTC (rev 173541)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2014-09-11 22:08:54 UTC (rev 173542)
@@ -40,7 +40,6 @@
: nodeAtPositionIsAssistedNode(false)
, isSelectable(false)
, isNearMarkedText(false)
- , touchCalloutEnabled(true)
{
}
@@ -48,7 +47,6 @@
bool nodeAtPositionIsAssistedNode;
bool isSelectable;
bool isNearMarkedText;
- bool touchCalloutEnabled;
String clickableElementName;
String url;
String title;
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (173541 => 173542)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-09-11 21:52:33 UTC (rev 173541)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-09-11 22:08:54 UTC (rev 173542)
@@ -782,9 +782,6 @@
- (SEL)_actionForLongPress
{
- if (!_positionInformation.touchCalloutEnabled)
- return nil;
-
if (_positionInformation.clickableElementName == "IMG")
return @selector(_showImageSheet);
else if (_positionInformation.clickableElementName == "A") {
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (173541 => 173542)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-09-11 21:52:33 UTC (rev 173541)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-09-11 22:08:54 UTC (rev 173542)
@@ -1898,10 +1898,8 @@
info.title = element->fastGetAttribute(HTMLNames::titleAttr).string();
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();
- }
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
