Diff
Modified: trunk/Source/WebKit2/ChangeLog (186057 => 186058)
--- trunk/Source/WebKit2/ChangeLog 2015-06-28 23:30:20 UTC (rev 186057)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-29 00:33:15 UTC (rev 186058)
@@ -1,5 +1,20 @@
2015-06-28 Dan Bernstein <[email protected]>
+ [Cocoa] Remove _WKSecurityOrigin.{h,mm}
+ https://bugs.webkit.org/show_bug.cgi?id=146402
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKSecurityOrigin.mm: Declare and define _WKSecurityOrigin here.
+ (-[WKSecurityOrigin methodSignatureForSelector:]): Moved into a WKBinaryCompatibility
+ category.
+ (-[WKSecurityOrigin forwardInvocation:]): Ditto.
+ * UIProcess/API/Cocoa/_WKSecurityOrigin.h: Removed.
+ * UIProcess/API/Cocoa/_WKSecurityOrigin.mm: Removed.
+ * WebKit2.xcodeproj/project.pbxproj: Removed references to _WKSecurityOrigin.{h,mm}.
+
+2015-06-28 Dan Bernstein <[email protected]>
+
Tried to fix the EFL buid after r186046.
* UIProcess/efl/PageUIClientEfl.cpp:
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm (186057 => 186058)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm 2015-06-28 23:30:20 UTC (rev 186057)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.mm 2015-06-29 00:33:15 UTC (rev 186058)
@@ -29,7 +29,6 @@
#if WK_API_ENABLED
#import "NSInvocationSPI.h"
-#import "_WKSecurityOrigin.h"
#import <WebCore/ResourceRequest.h>
#import <WebCore/SecurityOrigin.h>
#import <wtf/RefPtr.h>
@@ -70,10 +69,21 @@
return *_securityOrigin;
}
+@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];
@@ -84,8 +94,8 @@
[invocation invokeUsingIMP:[_WKSecurityOrigin instanceMethodForSelector:invocation.selector]];
}
-#endif
-
@end
+#endif // PLATFORM(IOS)
+
#endif // WK_API_ENABLED
Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h (186057 => 186058)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h 2015-06-28 23:30:20 UTC (rev 186057)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h 2015-06-29 00:33:15 UTC (rev 186058)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 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
-
-#import <Foundation/Foundation.h>
-#import <WebKit/WKSecurityOrigin.h>
-
-WK_CLASS_AVAILABLE(10_10, 8_0)
-@interface _WKSecurityOrigin : WKSecurityOrigin
-@end
-
-#endif
Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm (186057 => 186058)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm 2015-06-28 23:30:20 UTC (rev 186057)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm 2015-06-29 00:33:15 UTC (rev 186058)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2014 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 "config.h"
-#import "_WKSecurityOrigin.h"
-
-#if WK_API_ENABLED
-
-@implementation _WKSecurityOrigin
-@end
-
-#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (186057 => 186058)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-28 23:30:20 UTC (rev 186057)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-29 00:33:15 UTC (rev 186058)
@@ -773,8 +773,6 @@
3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */; };
3769079E18F340A2001DFF04 /* APIInjectedBundleFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */; };
37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
- 376C51191957452E0007B0FA /* _WKSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */; };
- 376C511A1957452E0007B0FA /* _WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */; };
377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2921,8 +2919,6 @@
376311FA1A3FB38B005A2E51 /* _WKSameDocumentNavigationTypeInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSameDocumentNavigationTypeInternal.h; sourceTree = "<group>"; };
3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = APIInjectedBundlePageUIClient.h; path = API/APIInjectedBundlePageUIClient.h; sourceTree = "<group>"; };
3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundleFormClient.h; sourceTree = "<group>"; };
- 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKSecurityOrigin.mm; sourceTree = "<group>"; };
- 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOrigin.h; sourceTree = "<group>"; };
37716A59195B910500EE8B1B /* ProcessAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessAssertion.cpp; sourceTree = "<group>"; };
377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEvents.h; sourceTree = "<group>"; };
377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
@@ -5304,8 +5300,6 @@
1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
7C89D2D61A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h */,
- 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */,
- 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */,
1A002D3F196B329400B9AD44 /* _WKSessionState.h */,
1A002D3E196B329400B9AD44 /* _WKSessionState.mm */,
1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */,
@@ -7515,7 +7509,6 @@
1F604BAA1889FBB800EE0395 /* _WKRenderingProgressEventsInternal.h in Headers */,
376311FD1A3FB5F7005A2E51 /* _WKSameDocumentNavigationType.h in Headers */,
376311FE1A3FB600005A2E51 /* _WKSameDocumentNavigationTypeInternal.h in Headers */,
- 376C511A1957452E0007B0FA /* _WKSecurityOrigin.h in Headers */,
1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */,
1A002D43196B337000B9AD44 /* _WKSessionStateInternal.h in Headers */,
2D6B371B18A967AD0042AE80 /* _WKThumbnailView.h in Headers */,
@@ -9333,7 +9326,6 @@
1A43E829188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm in Sources */,
1A9E328E182165A900F5D04C /* _WKRemoteObjectInterface.mm in Sources */,
1A9E328A1821636900F5D04C /* _WKRemoteObjectRegistry.mm in Sources */,
- 376C51191957452E0007B0FA /* _WKSecurityOrigin.mm in Sources */,
1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */,
2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */,
7C2413021AACFA7500A58C15 /* _WKUserContentExtensionStore.mm in Sources */,
