Title: [175701] trunk/Source/WebKit2
- Revision
- 175701
- Author
- timothy_hor...@apple.com
- Date
- 2014-11-06 10:57:04 -0800 (Thu, 06 Nov 2014)
Log Message
Prefer link action menus over images
https://bugs.webkit.org/show_bug.cgi?id=138461
<rdar://problem/18768377>
Reviewed by Anders Carlsson.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _defaultMenuItems:]):
Swap the priority of links and images.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (175700 => 175701)
--- trunk/Source/WebKit2/ChangeLog 2014-11-06 18:46:51 UTC (rev 175700)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-06 18:57:04 UTC (rev 175701)
@@ -1,3 +1,15 @@
+2014-11-06 Tim Horton <timothy_hor...@apple.com>
+
+ Prefer link action menus over images
+ https://bugs.webkit.org/show_bug.cgi?id=138461
+ <rdar://problem/18768377>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItems:]):
+ Swap the priority of links and images.
+
2014-11-05 Sam Weinig <s...@webkit.org>
Use std::unique_ptr for TileController
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175700 => 175701)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 18:46:51 UTC (rev 175700)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 18:57:04 UTC (rev 175701)
@@ -753,17 +753,17 @@
return _state != ActionMenuState::Ready ? @[ [NSMenuItem separatorItem] ] : @[ ];
}
- if (!hitTestResult->absoluteImageURL().isEmpty() && _hitTestResult.image) {
- _type = kWKActionMenuImage;
- return [self _defaultMenuItemsForImage];
- }
-
String absoluteLinkURL = hitTestResult->absoluteLinkURL();
if (!absoluteLinkURL.isEmpty() && WebCore::protocolIsInHTTPFamily(absoluteLinkURL)) {
_type = kWKActionMenuLink;
return [self _defaultMenuItemsForLink];
}
+ if (!hitTestResult->absoluteImageURL().isEmpty() && _hitTestResult.image) {
+ _type = kWKActionMenuImage;
+ return [self _defaultMenuItemsForImage];
+ }
+
if (hitTestResult->isTextNode()) {
NSArray *dataDetectorMenuItems = [self _defaultMenuItemsForDataDetectedText];
if (dataDetectorMenuItems.count) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
