Diff
Modified: trunk/Source/WebKit2/ChangeLog (198032 => 198033)
--- trunk/Source/WebKit2/ChangeLog 2016-03-11 19:05:22 UTC (rev 198032)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-11 19:29:08 UTC (rev 198033)
@@ -1,3 +1,18 @@
+2016-03-11 Beth Dakin <[email protected]>
+
+ _WKPreviewAction should be in an internal header
+ https://bugs.webkit.org/show_bug.cgi?id=155370
+
+ Reviewed by Tim Horton.
+
+ Move _WKPreviewAction to an Internal header since only the protocol needs to
+ be SPI.
+ * UIProcess/API/Cocoa/_WKPreviewAction.h:
+ * UIProcess/API/Cocoa/_WKPreviewAction.mm:
+ * UIProcess/API/Cocoa/_WKPreviewActionInternal.h: Added.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-03-11 Yusuke Suzuki <[email protected]>
[ES6] Implement Reflect.set without receiver support
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewAction.h (198032 => 198033)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewAction.h 2016-03-11 19:05:22 UTC (rev 198032)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewAction.h 2016-03-11 19:29:08 UTC (rev 198033)
@@ -35,12 +35,5 @@
@property(nonatomic, copy, readonly) NSString *identifier;
@end
-WK_CLASS_AVAILABLE(NA, WK_IOS_TBA)
-@interface _WKPreviewAction : UIPreviewAction <NSCopying, _WKPreviewActionItem>
-
-+ (instancetype)actionWithIdentifier:(NSString *)identifier title:(NSString *)title style:(UIPreviewActionStyle)style handler:(void (^)(UIPreviewAction *action, UIViewController *previewViewController))handler;
-
-@end
-
#endif // WK_API_ENABLED && TARGET_OS_IPHONE
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewAction.mm (198032 => 198033)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewAction.mm 2016-03-11 19:05:22 UTC (rev 198032)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewAction.mm 2016-03-11 19:29:08 UTC (rev 198033)
@@ -24,7 +24,7 @@
*/
#import "config.h"
-#import "_WKPreviewAction.h"
+#import "_WKPreviewActionInternal.h"
#if WK_API_ENABLED && TARGET_OS_IPHONE
Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewActionInternal.h (0 => 198033)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewActionInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewActionInternal.h 2016-03-11 19:29:08 UTC (rev 198033)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED && TARGET_OS_IPHONE
+
+#import "_WKPreviewAction.h"
+
+@interface _WKPreviewAction : UIPreviewAction <NSCopying, _WKPreviewActionItem>
+
++ (instancetype)actionWithIdentifier:(NSString *)identifier title:(NSString *)title style:(UIPreviewActionStyle)style handler:(void (^)(UIPreviewAction *action, UIViewController *previewViewController))handler;
+
+@end
+
+#endif // WK_API_ENABLED && TARGET_OS_IPHONE
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (198032 => 198033)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-11 19:05:22 UTC (rev 198032)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-11 19:29:08 UTC (rev 198033)
@@ -57,7 +57,7 @@
#import "_WKFocusedElementInfo.h"
#import "_WKFormInputSession.h"
#import "_WKInputDelegate.h"
-#import "_WKPreviewAction.h"
+#import "_WKPreviewActionInternal.h"
#import "_WKPreviewElementInfoInternal.h"
#import <CoreText/CTFont.h>
#import <CoreText/CTFontDescriptor.h>
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (198032 => 198033)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-03-11 19:05:22 UTC (rev 198032)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-03-11 19:29:08 UTC (rev 198033)
@@ -1194,6 +1194,7 @@
935EEBA2127761D0003322B8 /* InjectedBundleBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB901277615D003322B8 /* InjectedBundleBackForwardList.h */; };
935EEBA3127761D3003322B8 /* InjectedBundleBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935EEB911277615D003322B8 /* InjectedBundleBackForwardListItem.cpp */; };
935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB921277615D003322B8 /* InjectedBundleBackForwardListItem.h */; };
+ 93735EBB1C92986300336FA7 /* _WKPreviewActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93735EBA1C92986300336FA7 /* _WKPreviewActionInternal.h */; };
9391074F1BF6BC65008C17AD /* _WKPreviewElementInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391074E1BF6BC65008C17AD /* _WKPreviewElementInfoInternal.h */; };
9391F2CA121B679A00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */; };
9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
@@ -3214,6 +3215,7 @@
935EEB961277616D003322B8 /* WKBundleBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleBackForwardList.h; sourceTree = "<group>"; };
935EEB971277616D003322B8 /* WKBundleBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleBackForwardListItem.cpp; sourceTree = "<group>"; };
935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleBackForwardListItem.h; sourceTree = "<group>"; };
+ 93735EBA1C92986300336FA7 /* _WKPreviewActionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKPreviewActionInternal.h; sourceTree = "<group>"; };
9391074E1BF6BC65008C17AD /* _WKPreviewElementInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKPreviewElementInfoInternal.h; sourceTree = "<group>"; };
9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameNetworkingContext.h; sourceTree = "<group>"; };
9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
@@ -4980,6 +4982,7 @@
9323611D1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h */,
93A253EC1C922E1E00F9F68D /* _WKPreviewAction.h */,
93A253EE1C922E8E00F9F68D /* _WKPreviewAction.mm */,
+ 93735EBA1C92986300336FA7 /* _WKPreviewActionInternal.h */,
9395E6891BF2C33200F49BCE /* _WKPreviewElementInfo.h */,
9395E68B1BF2C35200F49BCE /* _WKPreviewElementInfo.mm */,
9391074E1BF6BC65008C17AD /* _WKPreviewElementInfoInternal.h */,
@@ -7370,6 +7373,7 @@
1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */,
1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */,
990D28AB1C6420C600986977 /* _WKAutomationSession.h in Headers */,
+ 93735EBB1C92986300336FA7 /* _WKPreviewActionInternal.h in Headers */,
1AE286801C7F92C00069AC4F /* _WKWebsiteDataSizeInternal.h in Headers */,
1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */,
1A4A9C5612B816CF008FE984 /* NetscapePluginModule.h in Headers */,
