Title: [173489] branches/safari-600.1.4.11-branch/Source/WebKit2
- Revision
- 173489
- Author
- [email protected]
- Date
- 2014-09-10 14:45:22 -0700 (Wed, 10 Sep 2014)
Log Message
Merged r173450. <rdar://problem/17629840>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173488 => 173489)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-10 21:45:22 UTC (rev 173489)
@@ -1,3 +1,30 @@
+2014-09-10 Babak Shafiei <[email protected]>
+
+ Merge r173450.
+
+ 2014-09-09 Enrica Casucci <[email protected]>
+
+ 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-08-27 Babak Shafiei <[email protected]>
Merge r171782.
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp (173488 => 173489)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2014-09-10 21:45:22 UTC (rev 173489)
@@ -38,6 +38,7 @@
encoder << nodeAtPositionIsAssistedNode;
encoder << isSelectable;
encoder << isNearMarkedText;
+ encoder << touchCalloutEnabled;
encoder << clickableElementName;
encoder << url;
encoder << title;
@@ -63,6 +64,9 @@
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 (173488 => 173489)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2014-09-10 21:45:22 UTC (rev 173489)
@@ -40,6 +40,7 @@
: nodeAtPositionIsAssistedNode(false)
, isSelectable(false)
, isNearMarkedText(false)
+ , touchCalloutEnabled(true)
{
}
@@ -47,6 +48,7 @@
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 (173488 => 173489)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-09-10 21:45:22 UTC (rev 173489)
@@ -782,6 +782,9 @@
- (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 (173488 => 173489)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-09-10 21:45:22 UTC (rev 173489)
@@ -1898,8 +1898,10 @@
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
