<!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>[185767] trunk</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/185767">185767</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-06-19 13:47:33 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename WKSecurityOrigin.h/cpp to WKSecurityOriginRef.h/cpp.
https://bugs.webkit.org/show_bug.cgi?id=146152
Reviewed by Dan Bernstein.
Source/WebKit2:
* CMakeLists.txt:
* Shared/API/c/WKSecurityOriginRef.cpp: Renamed from Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp.
* Shared/API/c/WKSecurityOriginRef.h: Renamed from Source/WebKit2/Shared/API/c/WKSecurityOrigin.h.
* UIProcess/API/efl/ewk_security_origin.cpp:
* UIProcess/API/efl/ewk_storage_manager.cpp:
* WebKit2.xcodeproj/project.pbxproj:
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
* WebKitTestRunner/WebNotificationProvider.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_security_origincpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_storage_managercpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerWebNotificationProvidercpp">trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSecurityOriginRefcpp">trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSecurityOriginRefh">trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSecurityOrigincpp">trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSecurityOriginh">trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> Shared/API/c/WKPluginInformation.cpp
</span><span class="cx"> Shared/API/c/WKRenderLayer.cpp
</span><span class="cx"> Shared/API/c/WKRenderObject.cpp
</span><del>- Shared/API/c/WKSecurityOrigin.cpp
</del><ins>+ Shared/API/c/WKSecurityOriginRef.cpp
</ins><span class="cx"> Shared/API/c/WKSerializedScriptValue.cpp
</span><span class="cx"> Shared/API/c/WKString.cpp
</span><span class="cx"> Shared/API/c/WKType.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-19 Brady Eidson <beidson@apple.com>
+
+ Rename WKSecurityOrigin.h/cpp to WKSecurityOriginRef.h/cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=146152
+
+ Reviewed by Dan Bernstein.
+
+ * CMakeLists.txt:
+
+ * Shared/API/c/WKSecurityOriginRef.cpp: Renamed from Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp.
+ * Shared/API/c/WKSecurityOriginRef.h: Renamed from Source/WebKit2/Shared/API/c/WKSecurityOrigin.h.
+
+ * UIProcess/API/efl/ewk_security_origin.cpp:
+ * UIProcess/API/efl/ewk_storage_manager.cpp:
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-06-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] scrollIntoViewIfNeeded is not working with scroll-snap points
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSecurityOrigincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#include "config.h"
-#include "WKSecurityOrigin.h"
-
-#include "APISecurityOrigin.h"
-#include "WKAPICast.h"
-
-using namespace WebKit;
-
-WKTypeID WKSecurityOriginGetTypeID()
-{
- return toAPI(API::SecurityOrigin::APIType);
-}
-
-WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string)
-{
- return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromString(toImpl(string)->string())).leakRef());
-}
-
-WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier)
-{
- return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier((toImpl(identifier)->string()))).leakRef());
-}
-
-WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port)
-{
- RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(toImpl(protocol)->string(), toImpl(host)->string(), port);
- return toAPI(securityOrigin.release().leakRef());
-}
-
-WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().databaseIdentifier());
-}
-
-WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().toString());
-}
-
-WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().protocol());
-}
-
-WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin)
-{
- return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().host());
-}
-
-unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin)
-{
- return toImpl(securityOrigin)->securityOrigin().port();
-}
-
-// For backwards ABI compatibility.
-extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin);
-extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin);
-
-WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin)
-{
- return WKSecurityOriginCopyHost(securityOrigin);
-}
-
-WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin)
-{
- return WKSecurityOriginCopyProtocol(securityOrigin);
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSecurityOriginh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef WKSecurityOrigin_h
-#define WKSecurityOrigin_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKSecurityOriginGetTypeID();
-
-WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string);
-WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier);
-WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port);
-
-WK_EXPORT WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin);
-WK_EXPORT WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin);
-WK_EXPORT WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin);
-WK_EXPORT WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin);
-WK_EXPORT unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKSecurityOrigin_h */
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSecurityOriginRefcppfromrev185766trunkSourceWebKit2SharedAPIcWKSecurityOrigincpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp (from rev 185766, trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp) (0 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.cpp 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+/*
+ * Copyright (C) 2010 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.
+ */
+
+#include "config.h"
+#include "WKSecurityOriginRef.h"
+
+#include "APISecurityOrigin.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKTypeID WKSecurityOriginGetTypeID()
+{
+ return toAPI(API::SecurityOrigin::APIType);
+}
+
+WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string)
+{
+ return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromString(toImpl(string)->string())).leakRef());
+}
+
+WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier)
+{
+ return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier((toImpl(identifier)->string()))).leakRef());
+}
+
+WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port)
+{
+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(toImpl(protocol)->string(), toImpl(host)->string(), port);
+ return toAPI(securityOrigin.release().leakRef());
+}
+
+WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().databaseIdentifier());
+}
+
+WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().toString());
+}
+
+WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().protocol());
+}
+
+WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin)
+{
+ return toCopiedAPI(toImpl(securityOrigin)->securityOrigin().host());
+}
+
+unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin)
+{
+ return toImpl(securityOrigin)->securityOrigin().port();
+}
+
+// For backwards ABI compatibility.
+extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin);
+extern "C" WK_EXPORT WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin);
+
+WKStringRef WKSecurityOriginGetHost(WKSecurityOriginRef securityOrigin)
+{
+ return WKSecurityOriginCopyHost(securityOrigin);
+}
+
+WKStringRef WKSecurityOriginGetProtocol(WKSecurityOriginRef securityOrigin)
+{
+ return WKSecurityOriginCopyProtocol(securityOrigin);
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSecurityOriginRefhfromrev185766trunkSourceWebKit2SharedAPIcWKSecurityOriginh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h (from rev 185766, trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h) (0 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOriginRef.h 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef WKSecurityOriginRef_h
+#define WKSecurityOriginRef_h
+
+#include <WebKit/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKSecurityOriginGetTypeID();
+
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string);
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier);
+WK_EXPORT WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port);
+
+WK_EXPORT WKStringRef WKSecurityOriginCopyDatabaseIdentifier(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginCopyToString(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginCopyProtocol(WKSecurityOriginRef securityOrigin);
+WK_EXPORT WKStringRef WKSecurityOriginCopyHost(WKSecurityOriginRef securityOrigin);
+WK_EXPORT unsigned short WKSecurityOriginGetPort(WKSecurityOriginRef securityOrigin);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKSecurityOriginRef_h */
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_security_origincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "ewk_security_origin.h"
</span><span class="cx">
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WKSecurityOrigin.h"
</del><ins>+#include "WKSecurityOriginRef.h"
</ins><span class="cx"> #include "WKString.h"
</span><span class="cx"> #include "ewk_security_origin_private.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_storage_managercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKArray.h"
</span><del>-#include "WKSecurityOrigin.h"
</del><ins>+#include "WKSecurityOriginRef.h"
</ins><span class="cx"> #include "WKString.h"
</span><span class="cx"> #include "ewk_security_origin_private.h"
</span><span class="cx"> #include "ewk_storage_manager_private.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -1004,6 +1004,8 @@
</span><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */; };
</span><span class="cx"> 51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */; };
</span><span class="cx"> 51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */; };
</span><ins>+ 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; };
+ 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 51D02F64132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D02F63132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp */; };
</span><span class="cx"> 51D02F6A132EC73700BEAA96 /* WebIconDatabaseMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */; };
</span><span class="cx"> 51D02F6B132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D02F68132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp */; };
</span><span class="lines">@@ -1794,8 +1796,6 @@
</span><span class="cx"> F62A76B812B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */; };
</span><span class="cx"> F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */; };
</span><span class="cx"> F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* APISecurityOrigin.h */; };
</span><del>- F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */; };
- F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445B12A885E9000612D8 /* WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6A25FDA12ADC6CC00DC40CC /* WebDatabaseManager.cpp */; };
</span><span class="cx"> F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A25FDB12ADC6CC00DC40CC /* WebDatabaseManager.h */; };
</span><span class="lines">@@ -3181,6 +3181,8 @@
</span><span class="cx"> 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBServerConnectionMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkResourceLoadParameters.cpp; path = Network/NetworkResourceLoadParameters.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoadParameters.h; path = Network/NetworkResourceLoadParameters.h; sourceTree = "<group>"; };
</span><ins>+ 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOriginRef.cpp; sourceTree = "<group>"; };
+ 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOriginRef.h; sourceTree = "<group>"; };
</ins><span class="cx"> 51D02F63132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51D02F65132EC6D300BEAA96 /* WebIconDatabaseProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebIconDatabaseProxy.messages.in; path = IconDatabase/WebIconDatabaseProxy.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseMessages.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4033,8 +4035,6 @@
</span><span class="cx"> F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> F634445512A885C8000612D8 /* APISecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISecurityOrigin.h; sourceTree = "<group>"; };
</span><del>- F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOrigin.cpp; sourceTree = "<group>"; };
- F634445B12A885E9000612D8 /* WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOrigin.h; sourceTree = "<group>"; };
</del><span class="cx"> F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPCookieAcceptPolicy.h; sourceTree = "<group>"; };
</span><span class="cx"> F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> F6A0C13F13281E6E0070430F /* ResourceCachesToClear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceCachesToClear.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7092,8 +7092,8 @@
</span><span class="cx"> 37948407150C4B9600E52CE9 /* WKRenderLayer.h */,
</span><span class="cx"> 37608820150414F700FC82C7 /* WKRenderObject.cpp */,
</span><span class="cx"> 37608821150414F700FC82C7 /* WKRenderObject.h */,
</span><del>- F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */,
- F634445B12A885E9000612D8 /* WKSecurityOrigin.h */,
</del><ins>+ 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */,
+ 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */,
</ins><span class="cx"> BC4075E7124FF0270068F20A /* WKSerializedScriptValue.cpp */,
</span><span class="cx"> BC4075E8124FF0270068F20A /* WKSerializedScriptValue.h */,
</span><span class="cx"> F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */,
</span><span class="lines">@@ -7838,6 +7838,7 @@
</span><span class="cx"> 1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */,
</span><span class="cx"> 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
</span><span class="cx"> 753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
</span><ins>+ 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */,
</ins><span class="cx"> 1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
</span><span class="cx"> 51217461164C20E30037A5C1 /* ShareableResource.h in Headers */,
</span><span class="cx"> 1A24BED5120894D100FBB059 /* SharedMemory.h in Headers */,
</span><span class="lines">@@ -8283,7 +8284,6 @@
</span><span class="cx"> 1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */,
</span><span class="cx"> 7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */,
</span><span class="cx"> 0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */,
</span><del>- F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */,
</del><span class="cx"> BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */,
</span><span class="cx"> F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */,
</span><span class="cx"> 75A8D2D7187D303A00C39C9E /* WKSessionRef.h in Headers */,
</span><span class="lines">@@ -9579,6 +9579,7 @@
</span><span class="cx"> 1A8EF96E1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */,
</span><span class="cx"> 7C3F8C90173AF52D007B7F39 /* PluginInformation.cpp in Sources */,
</span><ins>+ 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
</ins><span class="cx"> 7C135AAC173B0CFF00586AE2 /* PluginInformationMac.mm in Sources */,
</span><span class="cx"> 1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */,
</span><span class="cx"> 1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */,
</span><span class="lines">@@ -10042,7 +10043,6 @@
</span><span class="cx"> 1AC75A1E1B33695E0056745B /* HangDetectionDisablerMac.mm in Sources */,
</span><span class="cx"> 1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */,
</span><span class="cx"> 0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */,
</span><del>- F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */,
</del><span class="cx"> BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
</span><span class="cx"> 75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */,
</span><span class="cx"> 1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Tools/ChangeLog 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-19 Brady Eidson <beidson@apple.com>
+
+ Rename WKSecurityOrigin.h/cpp to WKSecurityOriginRef.h/cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=146152
+
+ Reviewed by Dan Bernstein.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ * WebKitTestRunner/WebNotificationProvider.cpp:
+
</ins><span class="cx"> 2015-06-19 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CheckedArithmetic's operator bool() and operator==() is broken.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <WebKit/WKBundleNodeHandlePrivate.h>
</span><span class="cx"> #include <WebKit/WKBundlePagePrivate.h>
</span><span class="cx"> #include <WebKit/WKBundlePrivate.h>
</span><del>-#include <WebKit/WKSecurityOrigin.h>
</del><ins>+#include <WebKit/WKSecurityOriginRef.h>
</ins><span class="cx"> #include <WebKit/WKURLRequest.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerWebNotificationProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp (185766 => 185767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2015-06-19 20:45:54 UTC (rev 185766)
+++ trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2015-06-19 20:47:33 UTC (rev 185767)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <WebKit/WKMutableArray.h>
</span><span class="cx"> #include <WebKit/WKNotification.h>
</span><span class="cx"> #include <WebKit/WKNumber.h>
</span><del>-#include <WebKit/WKSecurityOrigin.h>
</del><ins>+#include <WebKit/WKSecurityOriginRef.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span></span></pre>
</div>
</div>
</body>
</html>