Changeset 163992 in webkit

Timestamp:

Feb 12, 2014, 2:56:27 PM (12 years ago)

Author:

andersca@apple.com

Message:

Better iOS build fix.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::wrapCryptoKey):
(WebKit::WebPageProxy::unwrapCryptoKey):
Make these functions cross platform.

• UIProcess/mac/WebPageProxyMac.mm:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebPageProxyCocoa.mm (deleted)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)
• WebKit2.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-12  Anders Carlsson  <andersca@apple.com>
+
+        Better iOS build fix.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::wrapCryptoKey):
+        (WebKit::WebPageProxy::unwrapCryptoKey):
+        Make these functions cross platform.
+
+        * UIProcess/mac/WebPageProxyMac.mm:
+
 2014-02-12  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -95 +95 @@
 #include <WebCore/MIMETypeRegistry.h>
 #include <WebCore/RenderEmbeddedObject.h>
+#include <WebCore/SerializedCryptoKeyWrap.h>
 #include <WebCore/TextCheckerClient.h>
 #include <WebCore/WindowFeatures.h>
@@ -4480 +4481 @@
 }
 
-#if ENABLE(SUBTLE_CRYPTO) && !PLATFORM(COCOA)
+#if ENABLE(SUBTLE_CRYPTO)
 void WebPageProxy::wrapCryptoKey(const Vector<uint8_t>& key, bool& succeeded, Vector<uint8_t>& wrappedKey)
 {
-    notImplemented();
-    succeeded = false;
+    Vector<uint8_t> masterKey(16);
+    memset(masterKey.data(), 0, masterKey.size()); // FIXME: Not implemented yet, will be getting a key from client.
+    succeeded = wrapSerializedCryptoKey(masterKey, key, wrappedKey);
 }
 
 void WebPageProxy::unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, bool& succeeded, Vector<uint8_t>& key)
 {
-    notImplemented();
-    succeeded = false;
+    Vector<uint8_t> masterKey(16);
+    memset(masterKey.data(), 0, masterKey.size()); // FIXME: Not implemented yet, will be getting a key from client.
+    succeeded = unwrapSerializedCryptoKey(masterKey, wrappedKey, key);
 }
 #endif

trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -45 +45 @@
 #import <WebCore/GraphicsLayer.h>
 #import <WebCore/RuntimeApplicationChecks.h>
-#import <WebCore/SerializedCryptoKeyWrap.h>
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/TextAlternativeWithRange.h>

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -919 +919 @@
                 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */; };
                 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                A1EB7D5018AC2B6400F178F5 /* WebPageProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1EB7D4E18AC2B6400F178F5 /* WebPageProxyCocoa.mm */; };
                 A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */; };
@@ -2666 +2665 @@
                 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContextPrivateMac.mm; path = mac/WKContextPrivateMac.mm; sourceTree = "<group>"; };
                 9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContextPrivateMac.h; path = mac/WKContextPrivateMac.h; sourceTree = "<group>"; };
-                A1EB7D4E18AC2B6400F178F5 /* WebPageProxyCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageProxyCocoa.mm; sourceTree = "<group>"; };
                 A1EDD2D91884ACE000BBFE98 /* All.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = All.xcconfig; sourceTree = "<group>"; };
                 A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginProcessShim.xcconfig; sourceTree = "<group>"; };
@@ -4036 +4034 @@
                                 1ABC3DF41899E437004F0626 /* NavigationState.h */,
                                 1ABC3DF31899E437004F0626 /* NavigationState.mm */,
-                                A1EB7D4E18AC2B6400F178F5 /* WebPageProxyCocoa.mm */,
                         );
                         path = Cocoa;
@@ -7842 +7839 @@
                                 E19582D6153CC05400B60875 /* PDFKitImports.mm in Sources */,
                                 2D870D1016234FFE000A3F20 /* PDFPlugin.mm in Sources */,
-                                A1EB7D5018AC2B6400F178F5 /* WebPageProxyCocoa.mm in Sources */,
                                 2D2ADF0B16362DDB00197E47 /* PDFPluginAnnotation.mm in Sources */,
                                 2DA944A71884E94800ED86DB /* DownloadIOS.mm in Sources */,