Diff
Modified: trunk/Source/WebKit2/ChangeLog (163991 => 163992)
--- trunk/Source/WebKit2/ChangeLog 2014-02-12 22:54:26 UTC (rev 163991)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-12 22:56:27 UTC (rev 163992)
@@ -1,3 +1,14 @@
+2014-02-12 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Fix the iOS build after r163976
Deleted: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (163991 => 163992)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2014-02-12 22:54:26 UTC (rev 163991)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2014-02-12 22:56:27 UTC (rev 163992)
@@ -1,51 +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 "WebPageProxy.h"
-
-#import <WebCore/SerializedCryptoKeyWrap.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-#if ENABLE(SUBTLE_CRYPTO)
-void WebPageProxy::wrapCryptoKey(const Vector<uint8_t>& key, bool& succeeded, Vector<uint8_t>& wrappedKey)
-{
- 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)
-{
- 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
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163991 => 163992)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-12 22:54:26 UTC (rev 163991)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-12 22:56:27 UTC (rev 163992)
@@ -94,6 +94,7 @@
#include <WebCore/FocusDirection.h>
#include <WebCore/MIMETypeRegistry.h>
#include <WebCore/RenderEmbeddedObject.h>
+#include <WebCore/SerializedCryptoKeyWrap.h>
#include <WebCore/TextCheckerClient.h>
#include <WebCore/WindowFeatures.h>
#include <stdio.h>
@@ -4479,17 +4480,19 @@
m_process->send(Messages::WebPage::SetScrollPinningBehavior(pinning), m_pageID);
}
-#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
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (163991 => 163992)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-02-12 22:54:26 UTC (rev 163991)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-02-12 22:56:27 UTC (rev 163992)
@@ -44,7 +44,6 @@
#import <WebCore/DictationAlternative.h>
#import <WebCore/GraphicsLayer.h>
#import <WebCore/RuntimeApplicationChecks.h>
-#import <WebCore/SerializedCryptoKeyWrap.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/TextAlternativeWithRange.h>
#import <WebCore/UserAgent.h>
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163991 => 163992)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-12 22:54:26 UTC (rev 163991)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-12 22:56:27 UTC (rev 163992)
@@ -918,7 +918,6 @@
9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */; };
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 */; };
A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D792D41767CB0900881CBE /* ActivityAssertion.h */; };
@@ -2665,7 +2664,6 @@
9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessManagerMac.mm; sourceTree = "<group>"; };
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>"; };
A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SecItemShim.xcconfig; sourceTree = "<group>"; };
@@ -4035,7 +4033,6 @@
children = (
1ABC3DF41899E437004F0626 /* NavigationState.h */,
1ABC3DF31899E437004F0626 /* NavigationState.mm */,
- A1EB7D4E18AC2B6400F178F5 /* WebPageProxyCocoa.mm */,
);
path = Cocoa;
sourceTree = "<group>";
@@ -7841,7 +7838,6 @@
C574A58212E66681002DFE98 /* PasteboardTypes.mm in Sources */,
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 */,
2D2ADF1016364D8200197E47 /* PDFPluginChoiceAnnotation.mm in Sources */,
