Changeset 182219 in webkit

Timestamp:

Mar 31, 2015, 9:06:07 PM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/20365675> [iOS] Include Add to Reading List link action only where supported
​https://bugs.webkit.org/show_bug.cgi?id=143289

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/_WKElementAction.h: Excluded _WKElementActionTypeAddToReadingList from

the _WKElementActionType enum when Reading List is not supported.

• UIProcess/API/Cocoa/_WKElementAction.mm:

(+[_WKElementAction elementActionWithType:customTitle:]): Made Add to Reading List code
conditional on HAVE(SAFARI_SERVICES_FRAMEWORK).

• UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant showImageSheet]): Ditto.
(-[WKActionSheetAssistant showLinkSheet]): Ditto.

• config.h: Defined HAVE_SAFARI_SERVICES_FRAMEWORK.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKElementAction.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKElementAction.mm (modified) (6 diffs)
• UIProcess/ios/WKActionSheetAssistant.mm (modified) (4 diffs)
• config.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-31  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/20365675> [iOS] Include Add to Reading List link action only where supported
+        https://bugs.webkit.org/show_bug.cgi?id=143289
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/_WKElementAction.h: Excluded _WKElementActionTypeAddToReadingList from
+        the _WKElementActionType enum when Reading List is not supported.
+
+        * UIProcess/API/Cocoa/_WKElementAction.mm:
+        (+[_WKElementAction elementActionWithType:customTitle:]): Made Add to Reading List code
+        conditional on HAVE(SAFARI_SERVICES_FRAMEWORK).
+
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant showImageSheet]): Ditto.
+        (-[WKActionSheetAssistant showLinkSheet]): Ditto.
+
+        * config.h: Defined HAVE_SAFARI_SERVICES_FRAMEWORK.
+
 2015-03-31  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h

@@ -40 +40 @@
     _WKElementActionTypeCopy,
     _WKElementActionTypeSaveImage,
+#if !defined(TARGET_OS_IOS) || TARGET_OS_IOS
     _WKElementActionTypeAddToReadingList,
+#endif
 } WK_ENUM_AVAILABLE(10_10, 8_0);
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm

@@ -35 +35 @@
 #import "WKContentViewInteraction.h"
 #import "_WKActivatedElementInfoInternal.h"
-#import <SafariServices/SSReadingList.h>
 #import <WebCore/LocalizedStrings.h>
 #import <WebCore/SoftLinking.h>
@@ -41 +40 @@
 #import <wtf/text/WTFString.h>
 
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
+#import <SafariServices/SSReadingList.h>
 SOFT_LINK_FRAMEWORK(SafariServices);
 SOFT_LINK_CLASS(SafariServices, SSReadingList);
+#endif
 
 typedef void (^WKElementActionHandlerInternal)(WKActionSheetAssistant *, _WKActivatedElementInfo *);
@@ -77 +79 @@
 }
 
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
 static void addToReadingList(NSURL *targetURL, NSString *title)
 {
@@ -84 +87 @@
     [[getSSReadingListClass() defaultReadingList] addReadingListItemWithURL:targetURL title:title previewText:nil error:nil];
 }
+#endif
 
 + (instancetype)elementActionWithType:(_WKElementActionType)type customTitle:(NSString *)customTitle
@@ -108 +112 @@
         };
         break;
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
     case _WKElementActionTypeAddToReadingList:
         title = WEB_UI_STRING("Add to Reading List", "Title for Add to Reading List action button");
@@ -114 +119 @@
         };
         break;
+#endif
     default:
         [NSException raise:NSInvalidArgumentException format:@"There is no standard web element action of type %ld.", (long)type];

trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm

@@ -38 +38 @@
 #import "_WKActivatedElementInfoInternal.h"
 #import "_WKElementActionInternal.h"
-#import <SafariServices/SSReadingList.h>
 #import <UIKit/UIView.h>
 #import <WebCore/LocalizedStrings.h>
@@ -45 +44 @@
 #import <wtf/text/WTFString.h>
 
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
+#import <SafariServices/SSReadingList.h>
 SOFT_LINK_FRAMEWORK(SafariServices)
 SOFT_LINK_CLASS(SafariServices, SSReadingList)
+#endif
 
 SOFT_LINK_PRIVATE_FRAMEWORK(TCC)
@@ -247 +249 @@
     if (!positionInformation.url.isEmpty())
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeOpen]];
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
     if ([getSSReadingListClass() supportsURL:targetURL])
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeAddToReadingList]];
+#endif
     if (TCCAccessPreflight(getkTCCServicePhotos(), NULL) != kTCCAccessPreflightDenied)
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeSaveImage]];
@@ -289 +293 @@
     auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
     [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeOpen]];
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
     if ([getSSReadingListClass() supportsURL:targetURL])
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeAddToReadingList]];
+#endif
     if (![[targetURL scheme] length] || [[targetURL scheme] caseInsensitiveCompare:@"javascript"] != NSOrderedSame)
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeCopy]];

trunk/Source/WebKit2/config.h

@@ -89 +89 @@
 #endif
 #endif
+
+#ifndef HAVE_SAFARI_SERVICES_FRAMEWORK
+#if PLATFORM(IOS) && (!defined TARGET_OS_IOS || TARGET_OS_IOS)
+#define HAVE_SAFARI_SERVICES_FRAMEWORK 1
+#else
+#define HAVE_SAFARI_SERVICES_FRAMEWORK 0
+#endif
+#endif