<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164187] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164187">164187</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-15 19:11:47 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Remove WebSerializedJSValue SPI
https://bugs.webkit.org/show_bug.cgi?id=128720
Reviewed by Anders Carlsson.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj: Removed WebSerializedJSValue files from the project.
Source/WebKit/mac:
* WebKit.exp:
* WebView/WebSerializedJSValue.h: Removed.
* WebView/WebSerializedJSValue.mm: Removed.
* WebView/WebSerializedJSValuePrivate.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebKitexp">trunk/Source/WebKit/mac/WebKit.exp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebViewWebSerializedJSValueh">trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebSerializedJSValuemm">trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebSerializedJSValuePrivateh">trunk/Source/WebKit/mac/WebView/WebSerializedJSValuePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-15 Alexey Proskuryakov <ap@apple.com>
+
+ [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.
+
</ins><span class="cx"> 2014-02-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fixed linking on Win64.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -410,8 +410,6 @@
</span><span class="cx"> B80417701217A83100466BAE /* WebInspectorFrontend.mm in Sources */ = {isa = PBXBuildFile; fileRef = B804176E1217A83100466BAE /* WebInspectorFrontend.mm */; };
</span><span class="cx"> B82958D3132707D0000D0E79 /* CorrectionPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = B82958D1132707D0000D0E79 /* CorrectionPanel.h */; };
</span><span class="cx"> B82958D4132707D0000D0E79 /* CorrectionPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = B82958D2132707D0000D0E79 /* CorrectionPanel.mm */; };
</span><del>- 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 */; };
</del><span class="cx"> BC2E464D0FD8A96800A9D9DE /* WebViewData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2E464B0FD8A96800A9D9DE /* WebViewData.h */; };
</span><span class="cx"> BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */; };
</span><span class="cx"> BC42D324131ED1E00075FA4B /* WebLocalizableStringsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC42D322131ED1E00075FA4B /* WebLocalizableStringsInternal.h */; };
</span><span class="lines">@@ -447,7 +445,6 @@
</span><span class="cx"> ED7F6D8B0980683500C235ED /* WebNSDataExtrasPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> EDE983800BCDF5FE00FDAE28 /* WebNSArrayExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE9837E0BCDF5FE00FDAE28 /* WebNSArrayExtras.h */; };
</span><span class="cx"> EDE983810BCDF5FE00FDAE28 /* WebNSArrayExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = EDE9837F0BCDF5FE00FDAE28 /* WebNSArrayExtras.m */; };
</span><del>- F67DD7E6125E4527007BDCB8 /* WebSerializedJSValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7E5125E4527007BDCB8 /* WebSerializedJSValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> F834AAD70E64B1C700E2737C /* WebTextIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = F834AAD50E64B1C700E2737C /* WebTextIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F834AAD60E64B1C700E2737C /* WebTextIterator.mm */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="lines">@@ -798,8 +795,6 @@
</span><span class="cx"> B804176E1217A83100466BAE /* WebInspectorFrontend.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorFrontend.mm; sourceTree = "<group>"; };
</span><span class="cx"> B82958D1132707D0000D0E79 /* CorrectionPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CorrectionPanel.h; sourceTree = "<group>"; };
</span><span class="cx"> B82958D2132707D0000D0E79 /* CorrectionPanel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CorrectionPanel.mm; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> BC2E464B0FD8A96800A9D9DE /* WebViewData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewData.h; sourceTree = "<group>"; };
</span><span class="cx"> BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewData.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC42D322131ED1E00075FA4B /* WebLocalizableStringsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebLocalizableStringsInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -885,7 +880,6 @@
</span><span class="cx"> F5F732D202FF4D4F01A80180 /* WebKit.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; name = WebKit.exp; path = mac/WebKit.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
</span><span class="cx"> F5F81C3902B67C26018635CA /* WebRenderNode.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebRenderNode.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> F5F81C3A02B67C26018635CA /* WebRenderNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderNode.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><del>- F67DD7E5125E4527007BDCB8 /* WebSerializedJSValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedJSValuePrivate.h; sourceTree = "<group>"; };
</del><span class="cx"> F738C9E903FAD3DF0321FBE0 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> F79B974804019934036909D2 /* CarbonUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CarbonUtils.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="lines">@@ -1364,9 +1358,6 @@
</span><span class="cx"> C0B1F7E510AC8E3100C925D9 /* WebScriptWorld.h */,
</span><span class="cx"> C0B1F7E610AC8E3100C925D9 /* WebScriptWorld.mm */,
</span><span class="cx"> C0B1F7E710AC8E3100C925D9 /* WebScriptWorldInternal.h */,
</span><del>- BC26C69D10B743F400B687ED /* WebSerializedJSValue.h */,
- BC26C6A410B7447A00B687ED /* WebSerializedJSValue.mm */,
- F67DD7E5125E4527007BDCB8 /* WebSerializedJSValuePrivate.h */,
</del><span class="cx"> 936A2DE90FD2D08400D312DB /* WebTextCompletionController.h */,
</span><span class="cx"> 936A2DE70FD2D08000D312DB /* WebTextCompletionController.mm */,
</span><span class="cx"> F834AAD50E64B1C700E2737C /* WebTextIterator.h */,
</span><span class="lines">@@ -1899,8 +1890,6 @@
</span><span class="cx"> C0B1F7EA10AC8E3100C925D9 /* WebScriptWorldInternal.h in Headers */,
</span><span class="cx"> A5DEFC0B11D5331C00885273 /* WebSecurityOriginInternal.h in Headers */,
</span><span class="cx"> A5DEFC0C11D5331C00885273 /* WebSecurityOriginPrivate.h in Headers */,
</span><del>- BC26C69E10B743F400B687ED /* WebSerializedJSValue.h in Headers */,
- F67DD7E6125E4527007BDCB8 /* WebSerializedJSValuePrivate.h in Headers */,
</del><span class="cx"> 3AE15D5012DBDED4009323C8 /* WebStorageManagerInternal.h in Headers */,
</span><span class="cx"> A10C1D681820300E0036883A /* WebFixedPositionContent.h in Headers */,
</span><span class="cx"> 3AB02B0012C132B200FBB694 /* WebStorageManagerPrivate.h in Headers */,
</span><span class="lines">@@ -2331,7 +2320,6 @@
</span><span class="cx"> C0167BF90D7F5DD00028696E /* WebScriptDebugger.mm in Sources */,
</span><span class="cx"> C0B1F7E910AC8E3100C925D9 /* WebScriptWorld.mm in Sources */,
</span><span class="cx"> A5DEFC0A11D5331C00885273 /* WebSecurityOrigin.mm in Sources */,
</span><del>- BC26C6A510B7447A00B687ED /* WebSerializedJSValue.mm in Sources */,
</del><span class="cx"> 3AB02AF612C1319B00FBB694 /* WebStorageManager.mm in Sources */,
</span><span class="cx"> A10C1D691820300E0036883A /* WebFixedPositionContent.mm in Sources */,
</span><span class="cx"> 3ABB3C7B1309C3B500E93D94 /* WebStorageTrackerClient.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-02-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ [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 <ap@apple.com>
+
</ins><span class="cx"> [Mac] All WebKit clients should encrypt WebCrypto keys automatically
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128852
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKit.exp (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> .objc_class_name_WebScriptCallFrame
</span><span class="cx"> .objc_class_name_WebScriptWorld
</span><span class="cx"> .objc_class_name_WebSecurityOrigin
</span><del>-.objc_class_name_WebSerializedJSValue
</del><span class="cx"> .objc_class_name_WebTextIterator
</span><span class="cx"> .objc_class_name_WebUserContentURLPattern
</span><span class="cx"> .objc_class_name_WebView
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebSerializedJSValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.h (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebSerializedJSValuemm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/WebView/WebSerializedJSValue.mm (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,114 +0,0 @@
</span><del>-/*
- * 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
-
</del></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebSerializedJSValuePrivateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/WebView/WebSerializedJSValuePrivate.h (164186 => 164187)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre>
</div>
</div>
</body>
</html>