Title: [165305] trunk/Source/WebKit2
- Revision
- 165305
- Author
- [email protected]
- Date
- 2014-03-07 17:17:08 -0800 (Fri, 07 Mar 2014)
Log Message
[iOS WebKit2] Long-press on a link shows just "Copy".
https://bugs.webkit.org/show_bug.cgi?id=129938
<rdar://problem/16266054>
Reviewed by Benjamin Poulain.
When adding a FIXME comment, I accidentally removed the ! on
the if (!element) condition.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (165304 => 165305)
--- trunk/Source/WebKit2/ChangeLog 2014-03-08 01:13:01 UTC (rev 165304)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-08 01:17:08 UTC (rev 165305)
@@ -1,3 +1,17 @@
+2014-03-07 Enrica Casucci <[email protected]>
+
+ [iOS WebKit2] Long-press on a link shows just "Copy".
+ https://bugs.webkit.org/show_bug.cgi?id=129938
+ <rdar://problem/16266054>
+
+ Reviewed by Benjamin Poulain.
+
+ When adding a FIXME comment, I accidentally removed the ! on
+ the if (!element) condition.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
2014-03-07 Tim Horton <[email protected]>
[WebKit2][iOS] Main-frame custom content providers
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (165304 => 165305)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-08 01:13:01 UTC (rev 165304)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-08 01:17:08 UTC (rev 165305)
@@ -1466,24 +1466,21 @@
info.clickableElementName = hitNode->nodeName();
Element* element = hitNode->isElementNode() ? toElement(hitNode) : 0;
- // FIXME: should not return here but do what is under if (!elementIsLinkOrImage)
- if (element)
- return;
-
- Element* linkElement = nullptr;
- if (element->renderer() && element->renderer()->isRenderImage()) {
- elementIsLinkOrImage = true;
- linkElement = containingLinkElement(element);
-
- } else if (element->isLink()) {
- linkElement = element;
- elementIsLinkOrImage = true;
+ if (element) {
+ Element* linkElement = nullptr;
+ if (element->renderer() && element->renderer()->isRenderImage()) {
+ elementIsLinkOrImage = true;
+ linkElement = containingLinkElement(element);
+ } else if (element->isLink()) {
+ linkElement = element;
+ elementIsLinkOrImage = true;
+ }
+ if (linkElement)
+ info.url = ""
+ info.title = element->fastGetAttribute(HTMLNames::titleAttr).string();
+ if (element->renderer())
+ info.bounds = element->renderer()->absoluteBoundingBoxRect(true);
}
- if (linkElement)
- info.url = ""
- info.title = element->getAttribute(HTMLNames::titleAttr).string();
- if (element->renderer())
- info.bounds = element->renderer()->absoluteBoundingBoxRect(true);
}
if (!elementIsLinkOrImage) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
