[WK2 iOS] Need to show title in the action sheet for images not inside an anchor...

https://bugs.webkit.org/show_bug.cgi?id=132304
<rdar://problem/16535227>

Reviewed by Benjamin Poulain.

If the image in not inside an anchor tag, we must use the title attribute as
title for the action sheet.

* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 454e418..729205e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2014-04-28  Enrica Casucci  <enrica@apple.com>
+
+        [WK2 iOS] Need to show title in the action sheet for images not inside an anchor element.
+        https://bugs.webkit.org/show_bug.cgi?id=132304
+        <rdar://problem/16535227>
+
+        Reviewed by Benjamin Poulain.
+
+        If the image in not inside an anchor tag, we must use the title attribute as
+        title for the action sheet.
+
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
+
 2014-04-28  Tim Horton  <timothy_horton@apple.com>
 
         WebKit2 View Gestures (Swipe): Discard snapshots made with a different view size/pixel density

diff --git a/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm b/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm
index e7ac20a..a2f4a17 100644 (file)
--- a/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm
+++ b/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm
@@ -192,7 +192,7 @@ using namespace WebKit;
 
     NSString *titleString = nil;
     BOOL titleIsURL = NO;
-    if (showLinkTitle) {
+    if (showLinkTitle && [[targetURL absoluteString] length]) {
         if (isJavaScriptURL)
             titleString = WEB_UI_STRING_KEY("JavaScript", "JavaScript Action Sheet Title", "Title for action sheet for JavaScript link");
         else {