Diff
Modified: trunk/Source/WebKit/ChangeLog (204473 => 204474)
--- trunk/Source/WebKit/ChangeLog 2016-08-15 19:11:32 UTC (rev 204473)
+++ trunk/Source/WebKit/ChangeLog 2016-08-15 19:16:27 UTC (rev 204474)
@@ -1,3 +1,12 @@
+2016-08-15 Anders Carlsson <[email protected]>
+
+ Remove WebKeyGenerator
+ https://bugs.webkit.org/show_bug.cgi?id=160854
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2016-08-15 Joseph Pecoraro <[email protected]>
Remove unused includes of wtf headers
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (204473 => 204474)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-08-15 19:11:32 UTC (rev 204473)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-08-15 19:16:27 UTC (rev 204474)
@@ -261,7 +261,6 @@
939810820824BF01008DF038 /* WebNSDataExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BECD14290565830A005BB09C /* WebNSDataExtras.h */; };
939810830824BF01008DF038 /* WebUIDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
939810840824BF01008DF038 /* WebNSEventExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE887BFF056D3A6E009BB3E7 /* WebNSEventExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */; };
939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -332,7 +331,6 @@
939811130824BF01008DF038 /* WebHistory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65DA2608052CC18700A97B31 /* WebHistory.mm */; };
939811150824BF01008DF038 /* WebNSDataExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = BECD142A0565830A005BB09C /* WebNSDataExtras.m */; };
939811160824BF01008DF038 /* WebNSEventExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = BE887C00056D3A6E009BB3E7 /* WebNSEventExtras.m */; };
- 939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84723BE4056D719E0044BFEA /* WebKeyGenerator.mm */; };
939811190824BF01008DF038 /* WebNSPrintOperationExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = EDD1A5C705C83987008E3150 /* WebNSPrintOperationExtras.m */; };
9398111A0824BF01008DF038 /* WebResource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84311A1305EAAAF00088EDA4 /* WebResource.mm */; };
9398111B0824BF01008DF038 /* WebDefaultEditingDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BE95BEE505FD0805006E1513 /* WebDefaultEditingDelegate.m */; };
@@ -703,8 +701,6 @@
846171FA0624AE5B0071A4A3 /* WebDOMOperations.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDOMOperations.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
8467275C0367158500CA2ACA /* WebPluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginController.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
8467275D0367158500CA2ACA /* WebPluginController.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPluginController.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 84723BE4056D719E0044BFEA /* WebKeyGenerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKeyGenerator.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
848DFF840365FE6A00CA2ACA /* WebPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPlugin.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1589,8 +1585,6 @@
1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */,
9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */,
9345D4EB0365C5B2008635CE /* WebJavaScriptTextInputPanel.m */,
- 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */,
- 84723BE4056D719E0044BFEA /* WebKeyGenerator.mm */,
CD8BFCE615531224005AFB25 /* WebKitFullScreenListener.h */,
CD8BFCE515531224005AFB25 /* WebKitFullScreenListener.mm */,
31C11A6C1476552E0049A4CC /* WebNotificationClient.h */,
@@ -1851,7 +1845,6 @@
7A8FF0D11075024A00A80A08 /* WebInspectorPrivate.h in Headers */,
939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */,
37D1DCA81065928C0068F7EF /* WebJSPDFDoc.h in Headers */,
- 939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */,
9398101B0824BF01008DF038 /* WebKit.h in Headers */,
9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */,
9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */,
@@ -2266,7 +2259,6 @@
B80417701217A83100466BAE /* WebInspectorFrontend.mm in Sources */,
939810E40824BF01008DF038 /* WebJavaScriptTextInputPanel.m in Sources */,
37D1DCA91065928C0068F7EF /* WebJSPDFDoc.mm in Sources */,
- 939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */,
939811030824BF01008DF038 /* WebKitErrors.m in Sources */,
CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */,
939810C30824BF01008DF038 /* WebKitLogging.m in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (204473 => 204474)
--- trunk/Source/WebKit/mac/ChangeLog 2016-08-15 19:11:32 UTC (rev 204473)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-15 19:16:27 UTC (rev 204474)
@@ -1,3 +1,19 @@
+2016-08-15 Anders Carlsson <[email protected]>
+
+ Remove WebKeyGenerator
+ https://bugs.webkit.org/show_bug.cgi?id=160854
+
+ Reviewed by Dan Bernstein.
+
+ This SPI class is no longer used by Safari.
+
+ * WebCoreSupport/WebKeyGenerator.h: Removed.
+ * WebCoreSupport/WebKeyGenerator.mm: Removed.
+ (+[WebKeyGenerator sharedGenerator]): Deleted.
+ (toWebCertificateParseResult): Deleted.
+ (-[WebKeyGenerator addCertificatesToKeychainFromData:]): Deleted.
+ * WebView/WebFrameView.mm:
+
2016-08-15 Daniel Bates <[email protected]>
Cannot build WebKit for iOS device using Xcode 7.3/iOS 9.3 public SDK due to missing
Deleted: trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h (204473 => 204474)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h 2016-08-15 19:11:32 UTC (rev 204473)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h 2016-08-15 19:16:27 UTC (rev 204474)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2005, 2011 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.
- */
-
-typedef enum {
- WebCertificateParseResultSucceeded = 0,
- WebCertificateParseResultFailed = 1,
- WebCertificateParseResultPKCS7 = 2,
-} WebCertificateParseResult;
-
-#ifdef __OBJC__
-
-@interface WebKeyGenerator : NSObject
-
-+ (WebKeyGenerator *)sharedGenerator;
-- (WebCertificateParseResult)addCertificatesToKeychainFromData:(NSData *)data;
-
-@end
-
-#endif
Deleted: trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm (204473 => 204474)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm 2016-08-15 19:11:32 UTC (rev 204473)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm 2016-08-15 19:16:27 UTC (rev 204474)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2005, 2011 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 !PLATFORM(IOS)
-
-#import <WebKitLegacy/WebKeyGenerator.h>
-
-#import <WebKitSystemInterface.h>
-#import <wtf/Assertions.h>
-
-@implementation WebKeyGenerator
-
-+ (WebKeyGenerator *)sharedGenerator
-{
- static WebKeyGenerator *sharedGenerator = [[WebKeyGenerator alloc] init];
- return sharedGenerator;
-}
-
-static inline WebCertificateParseResult toWebCertificateParseResult(WKCertificateParseResult result)
-{
- // FIXME: WebKeyGenerator is not used in WebKit, and this code should be moved to Safari.
-
- switch (result) {
- case WKCertificateParseResultSucceeded:
- return WebCertificateParseResultSucceeded;
- case WKCertificateParseResultFailed:
- return WebCertificateParseResultFailed;
- case WKCertificateParseResultPKCS7:
- return WebCertificateParseResultPKCS7;
- }
-
- ASSERT_NOT_REACHED();
- return WebCertificateParseResultFailed;
-}
-
-- (WebCertificateParseResult)addCertificatesToKeychainFromData:(NSData *)data
-{
- return toWebCertificateParseResult(WKAddCertificatesToKeychainFromData([data bytes], [data length]));
-}
-
-@end
-
-#endif // !PLATFORM(IOS)
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (204473 => 204474)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2016-08-15 19:11:32 UTC (rev 204473)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2016-08-15 19:16:27 UTC (rev 204474)
@@ -38,7 +38,6 @@
#import "WebFrameViewPrivate.h"
#import "WebHistoryItemInternal.h"
#import "WebHTMLViewPrivate.h"
-#import "WebKeyGenerator.h"
#import "WebKitErrorsPrivate.h"
#import "WebKitStatisticsPrivate.h"
#import "WebKitVersionChecks.h"
