[Cocoa] Get rid of unused SPI declarations
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Feb 2016 15:38:00 +0000 (15:38 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Feb 2016 15:38:00 +0000 (15:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153915

Reviewed by Tim Horton.

* Platform/spi/Cocoa/NSInvocationSPI.h: Removed NSInvocation SPI method declaration.

* Platform/spi/ios/SafariServicesSPI.h: Removed.

* UIProcess/API/Cocoa/WKSecurityOrigin.mm:
(-[WKSecurityOrigin methodSignatureForSelector:]): Deleted.
(-[WKSecurityOrigin forwardInvocation:]): Deleted.

* UIProcess/ios/WKContentViewInteraction.mm: Removed unused #import.

* WebKit2.xcodeproj/project.pbxproj: Removed reference to deleted header.

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

Source/WebKit2/ChangeLog
Source/WebKit2/Platform/spi/Cocoa/NSInvocationSPI.h
Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h [deleted file]
Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm
Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index 80a57af..4bb0a64 100644 (file)
@@ -1,3 +1,22 @@
+2016-02-05  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Get rid of unused SPI declarations
+        https://bugs.webkit.org/show_bug.cgi?id=153915
+
+        Reviewed by Tim Horton.
+
+        * Platform/spi/Cocoa/NSInvocationSPI.h: Removed NSInvocation SPI method declaration.
+
+        * Platform/spi/ios/SafariServicesSPI.h: Removed.
+
+        * UIProcess/API/Cocoa/WKSecurityOrigin.mm:
+        (-[WKSecurityOrigin methodSignatureForSelector:]): Deleted.
+        (-[WKSecurityOrigin forwardInvocation:]): Deleted.
+
+        * UIProcess/ios/WKContentViewInteraction.mm: Removed unused #import.
+
+        * WebKit2.xcodeproj/project.pbxproj: Removed reference to deleted header.
+
 2016-02-04  Daniel Bates  <dabates@apple.com>
 
         WebKit for iOS Simulator fails to build with public iOS SDK
index 4e8cc5a..45c53f5 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <Foundation/NSPrivateDecls.h>
-
-#else
-
-@interface NSInvocation ()
-- (void)invokeUsingIMP:(IMP)imp;
-@end
-
-#endif // USE(APPLE_INTERNAL_SDK)
-
 @interface NSBlockInvocation : NSInvocation
 @end
diff --git a/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h b/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h
deleted file mode 100644 (file)
index 36d6fd4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-#if HAVE(SAFARI_SERVICES_FRAMEWORK)
-
-#import <WebCore/SoftLinking.h>
-#import <SafariServices/SFSafariViewController.h>
-
-@class _WKActivatedElementInfo;
-@class _WKElementAction;
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <SafariServices/SFSafariViewControllerPrivate.h>
-
-@interface SFSafariViewController (WKBuildFix)
-
-@property (nonatomic, setter=_setPreviewActions:) NSArray<_WKElementAction *> *_previewActions;
-@property (nonatomic, setter=_setActivatedElementInfo:) _WKActivatedElementInfo *_activatedElementInfo;
-
-@end
-
-#else
-
-@interface SFSafariViewController ()
-
-@property (nonatomic, setter=_setShowingLinkPreview:) BOOL _showingLinkPreview;
-@property (nonatomic, setter=_setPreviewActions:) NSArray<_WKElementAction *> *_previewActions;
-@property (nonatomic, setter=_setActivatedElementInfo:) _WKActivatedElementInfo *_activatedElementInfo;
-
-@end
-
-#endif
-
-SOFT_LINK_FRAMEWORK(SafariServices);
-SOFT_LINK_CLASS(SafariServices, SFSafariViewController);
-
-#endif
index 17989fb..bb0ee60 100644 (file)
@@ -28,7 +28,6 @@
 
 #if WK_API_ENABLED
 
-#import "NSInvocationSPI.h"
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/SecurityOrigin.h>
 #import <wtf/RefPtr.h>
 
 @end
 
-#pragma mark iOS 8 Safari binary compatibility
-
-#if PLATFORM(IOS)
-
-WK_CLASS_AVAILABLE(NA, 8_0)
-@interface _WKSecurityOrigin : WKSecurityOrigin
-@end
-
-@implementation _WKSecurityOrigin
-@end
-
-@implementation WKSecurityOrigin (WKBinaryCompatibility)
-
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector
-{
-    return [_WKSecurityOrigin instanceMethodSignatureForSelector:selector];
-}
-
-- (void)forwardInvocation:(NSInvocation *)invocation
-{
-    [invocation invokeUsingIMP:[_WKSecurityOrigin instanceMethodForSelector:invocation.selector]];
-}
-
-@end
-
-#endif // PLATFORM(IOS)
-
 #endif // WK_API_ENABLED
index 5194666..0d2ab6c 100644 (file)
@@ -34,7 +34,6 @@
 #import "ManagedConfigurationSPI.h"
 #import "NativeWebKeyboardEvent.h"
 #import "NativeWebTouchEvent.h"
-#import "SafariServicesSPI.h"
 #import "SmartMagnificationController.h"
 #import "TextInputSPI.h"
 #import "UIKitSPI.h"
index 1847be5..ac7ee17 100644 (file)
                2DAF06D618BD1A470081CEB1 /* SmartMagnificationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */; };
                2DAF06D718BD1A470081CEB1 /* SmartMagnificationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */; };
                2DAF4FFB1B636181006013D6 /* ViewGestureController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF4FFA1B636181006013D6 /* ViewGestureController.cpp */; };
-               2DB9C4AC1B3251BD0070F27F /* SafariServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB9C4AB1B3251BD0070F27F /* SafariServicesSPI.h */; };
                2DC6D9C318C44A610043BAD4 /* WKWebViewContentProviderRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */; };
                2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */; };
                2DD12A081A8177F3002C74E6 /* WKPageRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SmartMagnificationController.mm; path = ios/SmartMagnificationController.mm; sourceTree = "<group>"; };
                2DAF06D818BD23BA0081CEB1 /* SmartMagnificationController.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = SmartMagnificationController.messages.in; path = ios/SmartMagnificationController.messages.in; sourceTree = "<group>"; };
                2DAF4FFA1B636181006013D6 /* ViewGestureController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewGestureController.cpp; sourceTree = "<group>"; };
-               2DB9C4AB1B3251BD0070F27F /* SafariServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafariServicesSPI.h; sourceTree = "<group>"; };
                2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewContentProviderRegistry.h; sourceTree = "<group>"; };
                2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewContentProviderRegistry.mm; sourceTree = "<group>"; };
                2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageRenderingProgressEvents.h; sourceTree = "<group>"; };
                                CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */,
                                CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */,
                                CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */,
-                               2DB9C4AB1B3251BD0070F27F /* SafariServicesSPI.h */,
                                CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */,
                                CE1A0BD11A48E6C60054EF74 /* TextInputSPI.h */,
                                CEE4AE2A1A5DCF430002F49B /* UIKitSPI.h */,
                                0F5947A4187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h in Headers */,
                                0F59479D187B3B6000437857 /* RemoteScrollingTree.h in Headers */,
                                1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */,
-                               2DB9C4AC1B3251BD0070F27F /* SafariServicesSPI.h in Headers */,
                                BC2D021712AC41CB00E732A3 /* SameDocumentNavigationType.h in Headers */,
                                1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */,
                                E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,