Diff
Modified: trunk/Source/WebKit/ChangeLog (164186 => 164187)
--- trunk/Source/WebKit/ChangeLog 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/ChangeLog 2014-02-16 03:11:47 UTC (rev 164187)
@@ -1,3 +1,12 @@
+2014-02-15 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Remove WebSerializedJSValue SPI
+ https://bugs.webkit.org/show_bug.cgi?id=128720
+
+ Reviewed by Anders Carlsson.
+
+ * WebKit.xcodeproj/project.pbxproj: Removed WebSerializedJSValue files from the project.
+
2014-02-11 Alex Christensen <[email protected]>
Fixed linking on Win64.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (164186 => 164187)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-02-16 03:11:47 UTC (rev 164187)
@@ -410,8 +410,6 @@
B80417701217A83100466BAE /* WebInspectorFrontend.mm in Sources */ = {isa = PBXBuildFile; fileRef = B804176E1217A83100466BAE /* WebInspectorFrontend.mm */; };
B82958D3132707D0000D0E79 /* CorrectionPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = B82958D1132707D0000D0E79 /* CorrectionPanel.h */; };
B82958D4132707D0000D0E79 /* CorrectionPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = B82958D2132707D0000D0E79 /* CorrectionPanel.mm */; };
- BC26C69E10B743F400B687ED /* WebSerializedJSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC26C69D10B743F400B687ED /* WebSerializedJSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC26C6A510B7447A00B687ED /* WebSerializedJSValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC26C6A410B7447A00B687ED /* WebSerializedJSValue.mm */; };
BC2E464D0FD8A96800A9D9DE /* WebViewData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E464B0FD8A96800A9D9DE /* WebViewData.h */; };
BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */; };
BC42D324131ED1E00075FA4B /* WebLocalizableStringsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC42D322131ED1E00075FA4B /* WebLocalizableStringsInternal.h */; };
@@ -447,7 +445,6 @@
ED7F6D8B0980683500C235ED /* WebNSDataExtrasPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
EDE983800BCDF5FE00FDAE28 /* WebNSArrayExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE9837E0BCDF5FE00FDAE28 /* WebNSArrayExtras.h */; };
EDE983810BCDF5FE00FDAE28 /* WebNSArrayExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = EDE9837F0BCDF5FE00FDAE28 /* WebNSArrayExtras.m */; };
- F67DD7E6125E4527007BDCB8 /* WebSerializedJSValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7E5125E4527007BDCB8 /* WebSerializedJSValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
F834AAD70E64B1C700E2737C /* WebTextIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = F834AAD50E64B1C700E2737C /* WebTextIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F834AAD60E64B1C700E2737C /* WebTextIterator.mm */; };
/* End PBXBuildFile section */
@@ -798,8 +795,6 @@
B804176E1217A83100466BAE /* WebInspectorFrontend.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorFrontend.mm; sourceTree = "<group>"; };
B82958D1132707D0000D0E79 /* CorrectionPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CorrectionPanel.h; sourceTree = "<group>"; };
B82958D2132707D0000D0E79 /* CorrectionPanel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CorrectionPanel.mm; sourceTree = "<group>"; };
- BC26C69D10B743F400B687ED /* WebSerializedJSValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedJSValue.h; sourceTree = "<group>"; };
- BC26C6A410B7447A00B687ED /* WebSerializedJSValue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSerializedJSValue.mm; sourceTree = "<group>"; };
BC2E464B0FD8A96800A9D9DE /* WebViewData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewData.h; sourceTree = "<group>"; };
BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewData.mm; sourceTree = "<group>"; };
BC42D322131ED1E00075FA4B /* WebLocalizableStringsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebLocalizableStringsInternal.h; sourceTree = "<group>"; };
@@ -885,7 +880,6 @@
F5F732D202FF4D4F01A80180 /* WebKit.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; name = WebKit.exp; path = mac/WebKit.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
F5F81C3902B67C26018635CA /* WebRenderNode.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebRenderNode.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F5F81C3A02B67C26018635CA /* WebRenderNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderNode.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F67DD7E5125E4527007BDCB8 /* WebSerializedJSValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedJSValuePrivate.h; sourceTree = "<group>"; };
F738C9E903FAD3DF0321FBE0 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F79B974804019934036909D2 /* CarbonUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CarbonUtils.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1364,9 +1358,6 @@
C0B1F7E510AC8E3100C925D9 /* WebScriptWorld.h */,
C0B1F7E610AC8E3100C925D9 /* WebScriptWorld.mm */,
C0B1F7E710AC8E3100C925D9 /* WebScriptWorldInternal.h */,
- BC26C69D10B743F400B687ED /* WebSerializedJSValue.h */,
- BC26C6A410B7447A00B687ED /* WebSerializedJSValue.mm */,
- F67DD7E5125E4527007BDCB8 /* WebSerializedJSValuePrivate.h */,
936A2DE90FD2D08400D312DB /* WebTextCompletionController.h */,
936A2DE70FD2D08000D312DB /* WebTextCompletionController.mm */,
F834AAD50E64B1C700E2737C /* WebTextIterator.h */,
@@ -1899,8 +1890,6 @@
C0B1F7EA10AC8E3100C925D9 /* WebScriptWorldInternal.h in Headers */,
A5DEFC0B11D5331C00885273 /* WebSecurityOriginInternal.h in Headers */,
A5DEFC0C11D5331C00885273 /* WebSecurityOriginPrivate.h in Headers */,
- BC26C69E10B743F400B687ED /* WebSerializedJSValue.h in Headers */,
- F67DD7E6125E4527007BDCB8 /* WebSerializedJSValuePrivate.h in Headers */,
3AE15D5012DBDED4009323C8 /* WebStorageManagerInternal.h in Headers */,
A10C1D681820300E0036883A /* WebFixedPositionContent.h in Headers */,
3AB02B0012C132B200FBB694 /* WebStorageManagerPrivate.h in Headers */,
@@ -2331,7 +2320,6 @@
C0167BF90D7F5DD00028696E /* WebScriptDebugger.mm in Sources */,
C0B1F7E910AC8E3100C925D9 /* WebScriptWorld.mm in Sources */,
A5DEFC0A11D5331C00885273 /* WebSecurityOrigin.mm in Sources */,
- BC26C6A510B7447A00B687ED /* WebSerializedJSValue.mm in Sources */,
3AB02AF612C1319B00FBB694 /* WebStorageManager.mm in Sources */,
A10C1D691820300E0036883A /* WebFixedPositionContent.mm in Sources */,
3ABB3C7B1309C3B500E93D94 /* WebStorageTrackerClient.mm in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (164186 => 164187)
--- trunk/Source/WebKit/mac/ChangeLog 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-16 03:11:47 UTC (rev 164187)
@@ -1,5 +1,17 @@
2014-02-15 Alexey Proskuryakov <[email protected]>
+ [Mac] Remove WebSerializedJSValue SPI
+ https://bugs.webkit.org/show_bug.cgi?id=128720
+
+ Reviewed by Anders Carlsson.
+
+ * WebKit.exp:
+ * WebView/WebSerializedJSValue.h: Removed.
+ * WebView/WebSerializedJSValue.mm: Removed.
+ * WebView/WebSerializedJSValuePrivate.h: Removed.
+
+2014-02-15 Alexey Proskuryakov <[email protected]>
+
[Mac] All WebKit clients should encrypt WebCrypto keys automatically
https://bugs.webkit.org/show_bug.cgi?id=128852
Modified: trunk/Source/WebKit/mac/WebKit.exp (164186 => 164187)
--- trunk/Source/WebKit/mac/WebKit.exp 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/mac/WebKit.exp 2014-02-16 03:11:47 UTC (rev 164187)
@@ -28,7 +28,6 @@
.objc_class_name_WebScriptCallFrame
.objc_class_name_WebScriptWorld
.objc_class_name_WebSecurityOrigin
-.objc_class_name_WebSerializedJSValue
.objc_class_name_WebTextIterator
.objc_class_name_WebUserContentURLPattern
.objc_class_name_WebView
Deleted: trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.h (164186 => 164187)
--- trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.h 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.h 2014-02-16 03:11:47 UTC (rev 164187)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-@class WebSerializedJSValuePrivate;
-
-typedef const struct OpaqueJSContext* JSContextRef;
-typedef const struct OpaqueJSValue* JSValueRef;
-
-@interface WebSerializedJSValue : NSObject {
-@private
- WebSerializedJSValuePrivate *_private;
-}
-
-- (id)initWithValue:(JSValueRef)object context:(JSContextRef)sourceContext exception:(JSValueRef*)exception;
-- (JSValueRef)deserialize:(JSContextRef)destinationContext;
-
-@end
Deleted: trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.mm (164186 => 164187)
--- trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.mm 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.mm 2014-02-16 03:11:47 UTC (rev 164187)
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2009 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 "WebSerializedJSValuePrivate.h"
-
-#import <WebCore/SerializedScriptValue.h>
-#import <wtf/RefPtr.h>
-
-using namespace WebCore;
-
-@interface WebSerializedJSValuePrivate : NSObject {
-@public
- RefPtr<SerializedScriptValue> value;
-}
-@end
-
-@implementation WebSerializedJSValuePrivate
-@end
-
-@implementation WebSerializedJSValue
-
-- (id)initWithValue:(JSValueRef)value context:(JSContextRef)sourceContext exception:(JSValueRef*)exception
-{
- ASSERT_ARG(value, value);
- ASSERT_ARG(sourceContext, sourceContext);
-
- if (!value || !sourceContext) {
- [self release];
- return nil;
- }
-
- self = [super init];
- if (!self)
- return nil;
-
- _private = [[WebSerializedJSValuePrivate alloc] init];
-
- _private->value = SerializedScriptValue::create(sourceContext, value, exception);
- if (!_private->value) {
- [self release];
- return nil;
- }
-
- return self;
-}
-
-- (id)initWithInternalRepresentation:(void *)internalRepresenatation
-{
- ASSERT_ARG(internalRepresenatation, internalRepresenatation);
-
- if (!internalRepresenatation) {
- [self release];
- return nil;
- }
-
- self = [super init];
- if (!self)
- return nil;
-
- _private = [[WebSerializedJSValuePrivate alloc] init];
-
- _private->value = ((SerializedScriptValue*)internalRepresenatation);
- if (!_private->value) {
- [self release];
- return nil;
- }
-
- return self;
-}
-
-- (JSValueRef)deserialize:(JSContextRef)destinationContext
-{
- if (!_private || !_private->value)
- return 0;
- return _private->value->deserialize(destinationContext, 0);
-}
-
-- (void)dealloc
-{
- [_private release];
- _private = nil;
- [super dealloc];
-}
-
-- (void*)internalRepresentation
-{
- if (!_private)
- return 0;
- return _private->value.get();
-}
-
-@end
-
Deleted: trunk/Source/WebKit/mac/WebView/WebSerializedJSValuePrivate.h (164186 => 164187)
--- trunk/Source/WebKit/mac/WebView/WebSerializedJSValuePrivate.h 2014-02-16 03:07:14 UTC (rev 164186)
+++ trunk/Source/WebKit/mac/WebView/WebSerializedJSValuePrivate.h 2014-02-16 03:11:47 UTC (rev 164187)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2005 Apple Computer, 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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/WebSerializedJSValue.h>
-
-@interface WebSerializedJSValue(WebPrivate)
-- (id)initWithInternalRepresentation:(void*)internalRepresenatation;
-- (void*)internalRepresentation;
-@end
