Title: [196496] trunk/Source/WebKit2
- Revision
- 196496
- Author
- [email protected]
- Date
- 2016-02-12 12:31:35 -0800 (Fri, 12 Feb 2016)
Log Message
Re-name isClickableElement in InteractionInformationAtPosition to isElement
https://bugs.webkit.org/show_bug.cgi?id=154179
Reviewed by Enrica Casucci.
The bool is set for all elements, so it’s just confusing to call it a
clickableElement instead of just element.
* Shared/ios/InteractionInformationAtPosition.h:
* Shared/ios/InteractionInformationAtPosition.mm:
(WebKit::InteractionInformationAtPosition::encode):
(WebKit::InteractionInformationAtPosition::decode):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView gestureRecognizerShouldBegin:]):
(-[WKContentView _highlightLongPressRecognized:]):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (196495 => 196496)
--- trunk/Source/WebKit2/ChangeLog 2016-02-12 20:22:54 UTC (rev 196495)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-12 20:31:35 UTC (rev 196496)
@@ -1,3 +1,22 @@
+2016-02-12 Beth Dakin <[email protected]>
+
+ Re-name isClickableElement in InteractionInformationAtPosition to isElement
+ https://bugs.webkit.org/show_bug.cgi?id=154179
+
+ Reviewed by Enrica Casucci.
+
+ The bool is set for all elements, so it’s just confusing to call it a
+ clickableElement instead of just element.
+ * Shared/ios/InteractionInformationAtPosition.h:
+ * Shared/ios/InteractionInformationAtPosition.mm:
+ (WebKit::InteractionInformationAtPosition::encode):
+ (WebKit::InteractionInformationAtPosition::decode):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView gestureRecognizerShouldBegin:]):
+ (-[WKContentView _highlightLongPressRecognized:]):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
2016-02-12 Anders Carlsson <[email protected]>
Remove more unused process launcher code
Modified: trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h (196495 => 196496)
--- trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h 2016-02-12 20:22:54 UTC (rev 196495)
+++ trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h 2016-02-12 20:31:35 UTC (rev 196496)
@@ -46,7 +46,7 @@
bool isLink { false };
bool isImage { false };
bool isAnimatedImage { false };
- bool isClickableElement { false };
+ bool isElement { false };
#if ENABLE(DATA_DETECTION)
bool isDataDetectorLink { false };
#endif
Modified: trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm (196495 => 196496)
--- trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm 2016-02-12 20:22:54 UTC (rev 196495)
+++ trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm 2016-02-12 20:31:35 UTC (rev 196496)
@@ -49,7 +49,7 @@
encoder << isLink;
encoder << isImage;
encoder << isAnimatedImage;
- encoder << isClickableElement;
+ encoder << isElement;
encoder << url;
encoder << imageURL;
encoder << title;
@@ -101,7 +101,7 @@
if (!decoder.decode(result.isAnimatedImage))
return false;
- if (!decoder.decode(result.isClickableElement))
+ if (!decoder.decode(result.isElement))
return false;
if (!decoder.decode(result.url))
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (196495 => 196496)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-02-12 20:22:54 UTC (rev 196495)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-02-12 20:31:35 UTC (rev 196496)
@@ -1131,7 +1131,7 @@
// This is a different node than the assisted one.
// Prevent the gesture if there is no node.
// Allow the gesture if it is a node that wants highlight or if there is an action for it.
- if (!_positionInformation.isClickableElement)
+ if (!_positionInformation.isElement)
return NO;
return [self _actionForLongPress] != nil;
} else {
@@ -1245,7 +1245,7 @@
_isTapHighlightIDValid = YES;
break;
case UIGestureRecognizerStateEnded:
- if (_highlightLongPressCanClick && _positionInformation.isClickableElement) {
+ if (_highlightLongPressCanClick && _positionInformation.isElement) {
[self _attemptClickAtLocation:[gestureRecognizer startPoint]];
[self _finishInteraction];
} else
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (196495 => 196496)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-02-12 20:22:54 UTC (rev 196495)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-02-12 20:31:35 UTC (rev 196496)
@@ -2179,7 +2179,7 @@
if (hitNode) {
Element* element = is<Element>(*hitNode) ? downcast<Element>(hitNode) : nullptr;
if (element) {
- info.isClickableElement = true;
+ info.isElement = true;
Element* linkElement = nullptr;
if (element->renderer() && element->renderer()->isRenderImage()) {
elementIsLinkOrImage = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
