<!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>[189313] trunk/Source</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/189313">189313</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 16:34:53 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move SecurityOriginData from WK2 to WebCore.
https://bugs.webkit.org/show_bug.cgi?id=148739
Reviewed by Tim Horton.
This will be needed for upcoming IndexedDB work.
Source/WebCore:
No new tests (No behavior change.)
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* page/SecurityOriginData.cpp: Renamed from Source/WebKit2/Shared/SecurityOriginData.cpp.
(WebCore::SecurityOriginData::fromSecurityOrigin):
(WebCore::SecurityOriginData::fromFrame):
(WebCore::SecurityOriginData::securityOrigin):
(WebCore::SecurityOriginData::isolatedCopy):
(WebCore::operator==):
* page/SecurityOriginData.h: Renamed from Source/WebKit2/Shared/SecurityOriginData.h.
(WebCore::SecurityOriginData::encode):
(WebCore::SecurityOriginData::decode):
Source/WebKit2:
* CMakeLists.txt:
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseProcess.messages.in:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h:
* NetworkProcess/NetworkProcess.cpp:
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
* Shared/WebCrossThreadCopier.cpp:
* Shared/WebCrossThreadCopier.h:
* Shared/WebsiteData/WebsiteData.cpp:
* UIProcess/API/APINavigationClient.h:
* UIProcess/API/APIUIClient.h:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/Cocoa/WKUserContentController.mm:
* UIProcess/API/gtk/WebKitUIClient.cpp:
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
* UIProcess/Storage/StorageManager.cpp:
* UIProcess/Storage/StorageManager.h:
* UIProcess/Storage/StorageManager.messages.in:
* UIProcess/UserContent/WebScriptMessageHandler.h:
* UIProcess/UserContent/WebUserContentControllerProxy.cpp:
* UIProcess/UserContent/WebUserContentControllerProxy.h:
* UIProcess/UserContent/WebUserContentControllerProxy.messages.in:
* UIProcess/WebCookieManagerProxy.cpp:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
* WebProcess/MediaCache/WebMediaKeyStorageManager.h:
* WebProcess/Storage/StorageAreaMap.cpp:
* WebProcess/UserContent/WebUserContentController.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebProcess.cpp:
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessmessagesin">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifiercpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifierh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCrossThreadCopiercpp">trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCrossThreadCopierh">trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPINavigationClienth">trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegateh">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagermessagesin">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebScriptMessageHandlerh">trunk/Source/WebKit2/UIProcess/UserContent/WebScriptMessageHandler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxymessagesin">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaCacheWebMediaKeyStorageManagercpp">trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaCacheWebMediaKeyStorageManagerh">trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageAreaMapcpp">trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp">trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageSecurityOriginDatacpp">trunk/Source/WebCore/page/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginDatah">trunk/Source/WebCore/page/SecurityOriginData.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatacpp">trunk/Source/WebKit2/Shared/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatah">trunk/Source/WebKit2/Shared/SecurityOriginData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -1999,6 +1999,7 @@
</span><span class="cx"> page/PrintContext.cpp
</span><span class="cx"> page/Screen.cpp
</span><span class="cx"> page/SecurityOrigin.cpp
</span><ins>+ page/SecurityOriginData.cpp
</ins><span class="cx"> page/SecurityPolicy.cpp
</span><span class="cx"> page/Settings.cpp
</span><span class="cx"> page/SpatialNavigation.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebCore/ChangeLog 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-03 Brady Eidson <beidson@apple.com>
+
+ Move SecurityOriginData from WK2 to WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=148739
+
+ Reviewed by Tim Horton.
+
+ This will be needed for upcoming IndexedDB work.
+
+ No new tests (No behavior change.)
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+
+ * page/SecurityOriginData.cpp: Renamed from Source/WebKit2/Shared/SecurityOriginData.cpp.
+ (WebCore::SecurityOriginData::fromSecurityOrigin):
+ (WebCore::SecurityOriginData::fromFrame):
+ (WebCore::SecurityOriginData::securityOrigin):
+ (WebCore::SecurityOriginData::isolatedCopy):
+ (WebCore::operator==):
+ * page/SecurityOriginData.h: Renamed from Source/WebKit2/Shared/SecurityOriginData.h.
+ (WebCore::SecurityOriginData::encode):
+ (WebCore::SecurityOriginData::decode):
+
</ins><span class="cx"> 2015-09-03 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> New clang warns about boolean checks for |this| pointer in RenderObject debug methods
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -2118,6 +2118,8 @@
</span><span class="cx"> 51E1ECC10C91C90400DC255B /* IconRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E1ECBB0C91C90400DC255B /* IconRecord.h */; };
</span><span class="cx"> 51E1ECC20C91C90400DC255B /* PageURLRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E1ECBC0C91C90400DC255B /* PageURLRecord.cpp */; };
</span><span class="cx"> 51E1ECC30C91C90400DC255B /* PageURLRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E1ECBD0C91C90400DC255B /* PageURLRecord.h */; };
</span><ins>+ 51E3AA0A1B98BCAB0036AD81 /* SecurityOriginData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E3AA081B98BC9A0036AD81 /* SecurityOriginData.cpp */; };
+ 51E3AA0B1B98BCAB0036AD81 /* SecurityOriginData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E3AA091B98BC9A0036AD81 /* SecurityOriginData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 51E3F9C70DA059DC00250911 /* Storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E3F9C50DA059DC00250911 /* Storage.cpp */; };
</span><span class="cx"> 51E3F9D60DA05E1D00250911 /* JSStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E3F9D40DA05E1D00250911 /* JSStorage.cpp */; };
</span><span class="cx"> 51E4143416A6596300C633C7 /* ResourceHandleTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E4143216A6595100C633C7 /* ResourceHandleTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9412,6 +9414,8 @@
</span><span class="cx"> 51E1ECBB0C91C90400DC255B /* IconRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconRecord.h; sourceTree = "<group>"; };
</span><span class="cx"> 51E1ECBC0C91C90400DC255B /* PageURLRecord.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageURLRecord.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51E1ECBD0C91C90400DC255B /* PageURLRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageURLRecord.h; sourceTree = "<group>"; };
</span><ins>+ 51E3AA081B98BC9A0036AD81 /* SecurityOriginData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityOriginData.cpp; sourceTree = "<group>"; };
+ 51E3AA091B98BC9A0036AD81 /* SecurityOriginData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityOriginData.h; sourceTree = "<group>"; };
</ins><span class="cx"> 51E3F9C40DA059DC00250911 /* Storage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Storage.h; sourceTree = "<group>"; };
</span><span class="cx"> 51E3F9C50DA059DC00250911 /* Storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Storage.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51E3F9D10DA05D7100250911 /* Storage.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Storage.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -17222,6 +17226,8 @@
</span><span class="cx"> BCEC01BC0C274DAC009F4EC9 /* Screen.idl */,
</span><span class="cx"> BCD0E0F70E972C3500265DEA /* SecurityOrigin.cpp */,
</span><span class="cx"> BCD0E0F80E972C3500265DEA /* SecurityOrigin.h */,
</span><ins>+ 51E3AA081B98BC9A0036AD81 /* SecurityOriginData.cpp */,
+ 51E3AA091B98BC9A0036AD81 /* SecurityOriginData.h */,
</ins><span class="cx"> BCD0E0F90E972C3500265DEA /* SecurityOriginHash.h */,
</span><span class="cx"> 974D2DA2146A535D00D51F8B /* SecurityPolicy.cpp */,
</span><span class="cx"> 974D2DA3146A535D00D51F8B /* SecurityPolicy.h */,
</span><span class="lines">@@ -26644,6 +26650,7 @@
</span><span class="cx"> 4998AED213FB224D0090B1AA /* ScriptedAnimationController.h in Headers */,
</span><span class="cx"> 08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */,
</span><span class="cx"> E11C9D9B0EB3681200E409DB /* ScriptExecutionContext.h in Headers */,
</span><ins>+ 51E3AA0B1B98BCAB0036AD81 /* SecurityOriginData.h in Headers */,
</ins><span class="cx"> 41F066E40F64BCF600A07EAC /* ScriptGlobalObject.h in Headers */,
</span><span class="cx"> FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,
</span><span class="cx"> 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
</span><span class="lines">@@ -28551,6 +28558,7 @@
</span><span class="cx"> B275357A0B053814002CE64F /* FloatSizeMac.mm in Sources */,
</span><span class="cx"> D72F6D79153159A3001EE44E /* FlowThreadController.cpp in Sources */,
</span><span class="cx"> 14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */,
</span><ins>+ 51E3AA0A1B98BCAB0036AD81 /* SecurityOriginData.cpp in Sources */,
</ins><span class="cx"> B6D9D23614EABD260090D75E /* FocusEvent.cpp in Sources */,
</span><span class="cx"> B2C3DA640D006CD600EF6F26 /* Font.cpp in Sources */,
</span><span class="cx"> B2C3DA620D006CD600EF6F26 /* FontCache.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatacppfromrev189311trunkSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/SecurityOriginData.cpp (from rev 189311, trunk/Source/WebKit2/Shared/SecurityOriginData.cpp) (0 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginData.cpp (rev 0)
+++ trunk/Source/WebCore/page/SecurityOriginData.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+/*
+ * Copyright (C) 2011, 2015 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 "SecurityOriginData.h"
+
+#include "Document.h"
+#include "Frame.h"
+#include "SecurityOrigin.h"
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace WebCore {
+
+SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin& securityOrigin)
+{
+ SecurityOriginData securityOriginData;
+
+ securityOriginData.protocol = securityOrigin.protocol();
+ securityOriginData.host = securityOrigin.host();
+ securityOriginData.port = securityOrigin.port();
+
+ return securityOriginData;
+}
+
+SecurityOriginData SecurityOriginData::fromFrame(Frame* frame)
+{
+ if (!frame)
+ return SecurityOriginData();
+
+ Document* document = frame->document();
+ if (!document)
+ return SecurityOriginData();
+
+ SecurityOrigin* origin = document->securityOrigin();
+ if (!origin)
+ return SecurityOriginData();
+
+ return SecurityOriginData::fromSecurityOrigin(*origin);
+}
+
+Ref<SecurityOrigin> SecurityOriginData::securityOrigin() const
+{
+ return SecurityOrigin::create(protocol.isolatedCopy(), host.isolatedCopy(), port);
+}
+
+SecurityOriginData SecurityOriginData::isolatedCopy() const
+{
+ SecurityOriginData result;
+
+ result.protocol = protocol.isolatedCopy();
+ result.host = host.isolatedCopy();
+ result.port = port;
+
+ return result;
+}
+
+bool operator==(const SecurityOriginData& a, const SecurityOriginData& b)
+{
+ if (&a == &b)
+ return true;
+
+ return a.protocol == b.protocol
+ && a.host == b.host
+ && a.port == b.port;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatahfromrev189311trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/SecurityOriginData.h (from rev 189311, trunk/Source/WebKit2/Shared/SecurityOriginData.h) (0 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOriginData.h (rev 0)
+++ trunk/Source/WebCore/page/SecurityOriginData.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+ /*
+ * Copyright (C) 2011, 2015 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 SecurityOriginData_h
+#define SecurityOriginData_h
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+class Frame;
+class SecurityOrigin;
+
+struct SecurityOriginData {
+ WEBCORE_EXPORT static SecurityOriginData fromSecurityOrigin(const SecurityOrigin&);
+ WEBCORE_EXPORT static SecurityOriginData fromFrame(Frame*);
+
+ WEBCORE_EXPORT Ref<SecurityOrigin> securityOrigin() const;
+
+ // FIXME <rdar://9018386>: We should be sending more state across the wire than just the protocol,
+ // host, and port.
+
+ String protocol;
+ String host;
+ int port;
+
+ WEBCORE_EXPORT SecurityOriginData isolatedCopy() const;
+
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, SecurityOriginData&);
+};
+
+WEBCORE_EXPORT bool operator==(const SecurityOriginData&, const SecurityOriginData&);
+
+template<class Encoder>
+void SecurityOriginData::encode(Encoder& encoder) const
+{
+ encoder << protocol;
+ encoder << host;
+ encoder << port;
+}
+
+template<class Decoder>
+bool SecurityOriginData::decode(Decoder& decoder, SecurityOriginData& securityOriginData)
+{
+ if (!decoder.decode(securityOriginData.protocol))
+ return false;
+ if (!decoder.decode(securityOriginData.host))
+ return false;
+ if (!decoder.decode(securityOriginData.port))
+ return false;
+
+ return true;
+}
+
+} // namespace WebCore
+
+#endif // SecurityOriginData_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -224,7 +224,6 @@
</span><span class="cx"> Shared/OriginAndDatabases.cpp
</span><span class="cx"> Shared/PlatformPopupMenuData.cpp
</span><span class="cx"> Shared/PrintInfo.cpp
</span><del>- Shared/SecurityOriginData.cpp
</del><span class="cx"> Shared/SessionState.cpp
</span><span class="cx"> Shared/SessionTracker.cpp
</span><span class="cx"> Shared/ShareableBitmap.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-09-03 Brady Eidson <beidson@apple.com>
+
+ Move SecurityOriginData from WK2 to WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=148739
+
+ Reviewed by Tim Horton.
+
+ This will be needed for upcoming IndexedDB work.
+
+ * CMakeLists.txt:
+ * DatabaseProcess/DatabaseProcess.h:
+ * DatabaseProcess/DatabaseProcess.messages.in:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ * Shared/WebCrossThreadCopier.cpp:
+ * Shared/WebCrossThreadCopier.h:
+ * Shared/WebsiteData/WebsiteData.cpp:
+ * UIProcess/API/APINavigationClient.h:
+ * UIProcess/API/APIUIClient.h:
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ * UIProcess/API/gtk/WebKitUIClient.cpp:
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ * UIProcess/Storage/StorageManager.cpp:
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/Storage/StorageManager.messages.in:
+ * UIProcess/UserContent/WebScriptMessageHandler.h:
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ * UIProcess/UserContent/WebUserContentControllerProxy.messages.in:
+ * UIProcess/WebCookieManagerProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.h:
+ * WebProcess/Storage/StorageAreaMap.cpp:
+ * WebProcess/UserContent/WebUserContentController.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2015-09-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Add support for testing swipes
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class SessionID;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -43,7 +44,6 @@
</span><span class="cx"> class UniqueIDBDatabase;
</span><span class="cx">
</span><span class="cx"> struct DatabaseProcessCreationParameters;
</span><del>-struct SecurityOriginData;
</del><span class="cx">
</span><span class="cx"> class DatabaseProcess : public ChildProcess {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DatabaseProcess);
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><del>- void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID);
</del><ins>+ void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> indexedDatabaseOrigins();
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</span><span class="cx"> DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><del>- DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebKit::SecurityOriginData> origins, uint64_t callbackID)
</del><ins>+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "DatabaseProcessIDBConnectionMessages.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> virtual uint64_t messageSenderDestinationID() override { return m_serverConnectionIdentifier; }
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><del>- void establishConnection(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin);
</del><ins>+ void establishConnection(const String& databaseName, const WebCore::SecurityOriginData& openingOrigin, const WebCore::SecurityOriginData& mainFrameOrigin);
</ins><span class="cx"> void getOrEstablishIDBDatabaseMetadata(uint64_t requestID);
</span><span class="cx"> void deleteDatabase(uint64_t requestID, const String& databaseName);
</span><span class="cx"> void openTransaction(uint64_t requestID, int64_t transactionID, const Vector<int64_t>& objectStoreIDs, uint64_t transactionMode);
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> messages -> DatabaseProcessIDBConnection LegacyReceiver {
</span><del>- EstablishConnection(String databaseName, struct WebKit::SecurityOriginData openingOrigin, struct WebKit::SecurityOriginData mainFrameOrigin)
</del><ins>+ EstablishConnection(String databaseName, struct WebCore::SecurityOriginData openingOrigin, struct WebCore::SecurityOriginData mainFrameOrigin)
</ins><span class="cx"> GetOrEstablishIDBDatabaseMetadata(uint64_t requestID)
</span><span class="cx"> DeleteDatabase(uint64_t requestID, String databaseName)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> struct IDBGetResult;
</span><span class="cx"> struct IDBKeyData;
</span><span class="cx"> struct IDBKeyRangeData;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -59,8 +60,6 @@
</span><span class="cx"> class DatabaseProcessIDBConnection;
</span><span class="cx"> class UniqueIDBDatabaseBackingStore;
</span><span class="cx">
</span><del>-struct SecurityOriginData;
-
</del><span class="cx"> enum class UniqueIDBDatabaseShutdownType {
</span><span class="cx"> NormalShutdown,
</span><span class="cx"> DeleteShutdown
</span><span class="lines">@@ -134,10 +133,10 @@
</span><span class="cx"> String filenameForDatabaseName() const;
</span><span class="cx">
</span><span class="cx"> // Returns a string that is appropriate for use as a unique filename
</span><del>- String databaseFilenameIdentifier(const SecurityOriginData&) const;
</del><ins>+ String databaseFilenameIdentifier(const WebCore::SecurityOriginData&) const;
</ins><span class="cx">
</span><span class="cx"> // Returns true if this origin can use the same databases as the given origin.
</span><del>- bool canShareDatabases(const SecurityOriginData&, const SecurityOriginData&) const;
</del><ins>+ bool canShareDatabases(const WebCore::SecurityOriginData&, const WebCore::SecurityOriginData&) const;
</ins><span class="cx">
</span><span class="cx"> void postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<AsyncTask>, std::function<void (bool)> successCallback);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin)
</del><ins>+UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier(const String& databaseName, const WebCore::SecurityOriginData& openingOrigin, const WebCore::SecurityOriginData& mainFrameOrigin)
</ins><span class="cx"> : m_databaseName(databaseName)
</span><span class="cx"> , m_openingOrigin(openingOrigin)
</span><span class="cx"> , m_mainFrameOrigin(mainFrameOrigin)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><del>-#include "SecurityOriginData.h"
</del><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx"> class UniqueIDBDatabaseIdentifier {
</span><span class="cx"> public:
</span><span class="cx"> UniqueIDBDatabaseIdentifier();
</span><del>- UniqueIDBDatabaseIdentifier(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin);
</del><ins>+ UniqueIDBDatabaseIdentifier(const String& databaseName, const WebCore::SecurityOriginData& openingOrigin, const WebCore::SecurityOriginData& mainFrameOrigin);
</ins><span class="cx">
</span><span class="cx"> bool isNull() const;
</span><span class="cx">
</span><span class="cx"> const String& databaseName() const { return m_databaseName; }
</span><del>- const SecurityOriginData& openingOrigin() const { return m_openingOrigin; }
- const SecurityOriginData& mainFrameOrigin() const { return m_mainFrameOrigin; }
</del><ins>+ const WebCore::SecurityOriginData& openingOrigin() const { return m_openingOrigin; }
+ const WebCore::SecurityOriginData& mainFrameOrigin() const { return m_mainFrameOrigin; }
</ins><span class="cx">
</span><span class="cx"> UniqueIDBDatabaseIdentifier(WTF::HashTableDeletedValueType);
</span><span class="cx"> bool isHashTableDeletedValue() const;
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_databaseName;
</span><del>- SecurityOriginData m_openingOrigin;
- SecurityOriginData m_mainFrameOrigin;
</del><ins>+ WebCore::SecurityOriginData m_openingOrigin;
+ WebCore::SecurityOriginData m_mainFrameOrigin;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool operator==(const UniqueIDBDatabaseIdentifier&, const UniqueIDBDatabaseIdentifier&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "NetworkProcessProxyMessages.h"
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="lines">@@ -50,6 +49,7 @@
</span><span class="cx"> #include <WebCore/Logging.h>
</span><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class CertificateInfo;
</span><span class="cx"> class NetworkStorageSession;
</span><span class="cx"> class SecurityOrigin;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -54,7 +55,6 @@
</span><span class="cx"> class NetworkConnectionToWebProcess;
</span><span class="cx"> class NetworkProcessSupplement;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><del>-struct SecurityOriginData;
</del><span class="cx">
</span><span class="cx"> class NetworkProcess : public ChildProcess, private DownloadManager::Client {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NetworkProcess);
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><span class="cx"> static Vector<Ref<WebCore::SecurityOrigin>> cfURLCacheOrigins();
</span><del>- static void clearCFURLCacheForOrigins(const Vector<SecurityOriginData>&);
</del><ins>+ static void clearCFURLCacheForOrigins(const Vector<WebCore::SecurityOriginData>&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><del>- void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
</del><ins>+ void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> // FIXME: This should take a session ID so we can identify which disk cache to delete.
</span><span class="cx"> void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</span><span class="cx"> DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><del>- DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebKit::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
</del><ins>+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)
</span><span class="cx"> ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "SandboxExtension.h"
</span><del>-#import "SecurityOriginData.h"
</del><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><span class="cx"> #import <WebCore/NetworkStorageSession.h>
</span><span class="cx"> #import <WebCore/PublicSuffix.h>
</span><span class="cx"> #import <WebCore/ResourceRequestCFNet.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><ins>+#import <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/RAMSize.h>
</span><span class="cx">
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::clearCFURLCacheForOrigins(const Vector<SecurityOriginData>& origins)
</del><ins>+void NetworkProcess::clearCFURLCacheForOrigins(const Vector<WebCore::SecurityOriginData>& origins)
</ins><span class="cx"> {
</span><span class="cx"> auto hostNames = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
</span><span class="cx"> for (auto& origin : origins)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -1,121 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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 "SecurityOriginData.h"
-
-#include "APIArray.h"
-#include "APISecurityOrigin.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebFrame.h"
-#include <WebCore/Document.h>
-#include <WebCore/Frame.h>
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin& securityOrigin)
-{
- SecurityOriginData securityOriginData;
-
- securityOriginData.protocol = securityOrigin.protocol();
- securityOriginData.host = securityOrigin.host();
- securityOriginData.port = securityOrigin.port();
-
- return securityOriginData;
-}
-
-SecurityOriginData SecurityOriginData::fromFrame(WebFrame* frame)
-{
- if (!frame)
- return SecurityOriginData();
-
- return SecurityOriginData::fromFrame(frame->coreFrame());
-}
-
-SecurityOriginData SecurityOriginData::fromFrame(Frame* frame)
-{
- if (!frame)
- return SecurityOriginData();
-
- Document* document = frame->document();
- if (!document)
- return SecurityOriginData();
-
- SecurityOrigin* origin = document->securityOrigin();
- if (!origin)
- return SecurityOriginData();
-
- return SecurityOriginData::fromSecurityOrigin(*origin);
-}
-
-Ref<SecurityOrigin> SecurityOriginData::securityOrigin() const
-{
- return SecurityOrigin::create(protocol.isolatedCopy(), host.isolatedCopy(), port);
-}
-
-void SecurityOriginData::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << protocol;
- encoder << host;
- encoder << port;
-}
-
-bool SecurityOriginData::decode(IPC::ArgumentDecoder& decoder, SecurityOriginData& securityOriginData)
-{
- if (!decoder.decode(securityOriginData.protocol))
- return false;
- if (!decoder.decode(securityOriginData.host))
- return false;
- if (!decoder.decode(securityOriginData.port))
- return false;
-
- return true;
-}
-
-SecurityOriginData SecurityOriginData::isolatedCopy() const
-{
- SecurityOriginData result;
-
- result.protocol = protocol.isolatedCopy();
- result.host = host.isolatedCopy();
- result.port = port;
-
- return result;
-}
-
-bool operator==(const SecurityOriginData& a, const SecurityOriginData& b)
-{
- if (&a == &b)
- return true;
-
- return a.protocol == b.protocol
- && a.host == b.host
- && a.port == b.port;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/SecurityOriginData.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>- /*
- * Copyright (C) 2011 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 SecurityOriginData_h
-#define SecurityOriginData_h
-
-#include "APIObject.h"
-#include <wtf/text/WTFString.h>
-
-namespace IPC {
-class ArgumentDecoder;
-class ArgumentEncoder;
-}
-
-namespace WebCore {
-class Frame;
-class SecurityOrigin;
-}
-
-namespace WebKit {
-
-class WebFrame;
-
-struct SecurityOriginData {
- static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin&);
- static SecurityOriginData fromFrame(WebFrame*);
- static SecurityOriginData fromFrame(WebCore::Frame*);
-
- Ref<WebCore::SecurityOrigin> securityOrigin() const;
-
- void encode(IPC::ArgumentEncoder&) const;
- static bool decode(IPC::ArgumentDecoder&, SecurityOriginData&);
-
- // FIXME <rdar://9018386>: We should be sending more state across the wire than just the protocol,
- // host, and port.
-
- String protocol;
- String host;
- int port;
-
- SecurityOriginData isolatedCopy() const;
-};
-
-bool operator==(const SecurityOriginData&, const SecurityOriginData&);
-
-} // namespace WebKit
-
-#endif // SecurityOriginData_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBIdentifier.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <WebCore/IDBKeyData.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -31,13 +31,15 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+namespace WebCore {
+struct SecurityOriginData;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx"> class IDBIdentifier;
</span><span class="cx"> class UniqueIDBDatabaseIdentifier;
</span><span class="cx">
</span><span class="cx"> enum class UniqueIDBDatabaseShutdownType;
</span><del>-
-struct SecurityOriginData;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -62,8 +64,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<> struct CrossThreadCopierBase<false, false, WebKit::SecurityOriginData> {
- static WebKit::SecurityOriginData copy(const WebKit::SecurityOriginData& type);
</del><ins>+template<> struct CrossThreadCopierBase<false, false, WebCore::SecurityOriginData> {
+ static WebCore::SecurityOriginData copy(const WebCore::SecurityOriginData& type);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct CrossThreadCopierBase<false, false, Vector<char>> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -27,20 +27,20 @@
</span><span class="cx"> #include "WebsiteData.h"
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><del>-#include "SecurityOriginData.h"
</del><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> void WebsiteData::Entry::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><del>- encoder << SecurityOriginData::fromSecurityOrigin(*origin);
</del><ins>+ encoder << WebCore::SecurityOriginData::fromSecurityOrigin(*origin);
</ins><span class="cx"> encoder.encodeEnum(type);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebsiteData::Entry::decode(IPC::ArgumentDecoder& decoder, WebsiteData::Entry& result)
</span><span class="cx"> {
</span><del>- SecurityOriginData securityOriginData;
</del><ins>+ WebCore::SecurityOriginData securityOriginData;
</ins><span class="cx"> if (!decoder.decode(securityOriginData))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPINavigationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/API/APINavigationClient.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -50,7 +51,6 @@
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebProtectionSpace;
</span><span class="cx"> struct NavigationActionData;
</span><del>-struct SecurityOriginData;
</del><span class="cx"> struct WebNavigationDataStore;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> virtual void didStartProvisionalNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
</span><span class="cx"> virtual void didReceiveServerRedirectForProvisionalNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
</span><span class="cx"> virtual void didFailProvisionalNavigationWithError(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Navigation*, const WebCore::ResourceError&, API::Object*) { }
</span><del>- virtual void didFailProvisionalLoadInSubframeWithError(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WebKit::SecurityOriginData&, API::Navigation*, const WebCore::ResourceError&, API::Object*) { }
</del><ins>+ virtual void didFailProvisionalLoadInSubframeWithError(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WebCore::SecurityOriginData&, API::Navigation*, const WebCore::ResourceError&, API::Object*) { }
</ins><span class="cx"> virtual void didCommitNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
</span><span class="cx"> virtual void didFinishDocumentLoad(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
</span><span class="cx"> virtual void didFinishNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class ResourceRequest;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> struct WindowFeatures;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,7 +57,6 @@
</span><span class="cx"> class WebOpenPanelResultListenerProxy;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> struct NavigationActionData;
</span><del>-struct SecurityOriginData;
</del><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> class WebMediaSessionMetadata;
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~UIClient() { }
</span><span class="cx">
</span><del>- virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
</del><ins>+ virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
</ins><span class="cx"> virtual void showPage(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void didEnterFullscreen(WebKit::WebPageProxy*) { }
</span><span class="lines">@@ -85,9 +85,9 @@
</span><span class="cx"> virtual void focus(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void unfocus(WebKit::WebPageProxy*) { }
</span><span class="cx">
</span><del>- virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void ()> completionHandler) { completionHandler(); }
- virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (bool)> completionHandler) { completionHandler(false); }
- virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (const WTF::String&)> completionHandler) { completionHandler(WTF::String()); }
</del><ins>+ virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void ()> completionHandler) { completionHandler(); }
+ virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void (bool)> completionHandler) { completionHandler(false); }
+ virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void (const WTF::String&)> completionHandler) { completionHandler(WTF::String()); }
</ins><span class="cx">
</span><span class="cx"> virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { }
</span><span class="cx"> virtual void mouseDidMoveOverElement(WebKit::WebPageProxy*, const WebKit::WebHitTestResult::Data&, WebKit::WebEvent::Modifiers, API::Object*) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PluginInformation.h"
</span><span class="cx"> #include "PrintInfo.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKPagePolicyClientInternal.h"
</span><span class="cx"> #include "WKPageRenderingProgressEventsInternal.h"
</span><span class="lines">@@ -67,6 +66,7 @@
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebProtectionSpace.h"
</span><span class="cx"> #include <WebCore/Page.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/WindowFeatures.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __BLOCKS__
</span><span class="lines">@@ -2047,7 +2047,7 @@
</span><span class="cx"> m_client.didFailNavigation(toAPI(&page), toAPI(navigation), toAPI(error), toAPI(userData), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didFailProvisionalLoadInSubframeWithError(WebPageProxy& page, WebFrameProxy& subframe, const WebKit::SecurityOriginData& securityOriginData, API::Navigation* navigation, const WebCore::ResourceError& error, API::Object* userData) override
</del><ins>+ virtual void didFailProvisionalLoadInSubframeWithError(WebPageProxy& page, WebFrameProxy& subframe, const WebCore::SecurityOriginData& securityOriginData, API::Navigation* navigation, const WebCore::ResourceError& error, API::Object* userData) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didFailProvisionalLoadInSubframe)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "APISerializedScriptValue.h"
</span><del>-#import "SecurityOriginData.h"
</del><span class="cx"> #import "WKFrameInfoInternal.h"
</span><span class="cx"> #import "WKNSArray.h"
</span><span class="cx"> #import "WKScriptMessageHandler.h"
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx"> #import "WebScriptMessageHandler.h"
</span><span class="cx"> #import "WebUserContentControllerProxy.h"
</span><span class="cx"> #import "_WKUserContentFilterInternal.h"
</span><ins>+#import <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #import <WebCore/SerializedScriptValue.h>
</span><span class="cx">
</span><span class="cx"> @implementation WKUserContentController
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didPostMessage(WebKit::WebPageProxy& page, WebKit::WebFrameProxy& frame, const WebKit::SecurityOriginData& securityOriginData, WebCore::SerializedScriptValue& serializedScriptValue)
</del><ins>+ virtual void didPostMessage(WebKit::WebPageProxy& page, WebKit::WebFrameProxy& frame, const WebCore::SecurityOriginData& securityOriginData, WebCore::SerializedScriptValue& serializedScriptValue)
</ins><span class="cx"> {
</span><span class="cx"> @autoreleasepool {
</span><span class="cx"> RetainPtr<WKFrameInfo> frameInfo = wrapper(API::FrameInfo::create(frame, securityOriginData.securityOrigin()));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*, WebFrameProxy*, const SecurityOriginData&, const WebCore::ResourceRequest& resourceRequest, const WebCore::WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
</del><ins>+ virtual PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest& resourceRequest, const WebCore::WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
</ins><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(resourceRequest));
</span><span class="cx"> WebKitNavigationAction navigationAction(request.get(), navigationActionData);
</span><span class="lines">@@ -62,18 +62,18 @@
</span><span class="cx"> webkitWebViewClosePage(m_webView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void runJavaScriptAlert(WebPageProxy*, const String& message, WebFrameProxy*, const SecurityOriginData&, std::function<void ()> completionHandler) override
</del><ins>+ virtual void runJavaScriptAlert(WebPageProxy*, const String& message, WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void ()> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> webkitWebViewRunJavaScriptAlert(m_webView, message.utf8());
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void runJavaScriptConfirm(WebPageProxy*, const String& message, WebFrameProxy*, const SecurityOriginData&, std::function<void (bool)> completionHandler) override
</del><ins>+ virtual void runJavaScriptConfirm(WebPageProxy*, const String& message, WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void (bool)> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> completionHandler(webkitWebViewRunJavaScriptConfirm(m_webView, message.utf8()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void runJavaScriptPrompt(WebPageProxy*, const String& message, const String& defaultValue, WebFrameProxy*, const SecurityOriginData&, std::function<void (const String&)> completionHandler) override
</del><ins>+ virtual void runJavaScriptPrompt(WebPageProxy*, const String& message, const String& defaultValue, WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void (const String&)> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> CString result = webkitWebViewRunJavaScriptPrompt(m_webView, message.utf8(), defaultValue.utf8());
</span><span class="cx"> if (result.isNull()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -46,9 +46,12 @@
</span><span class="cx"> class Navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace WebCore {
+struct SecurityOriginData;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct SecurityOriginData;
</del><span class="cx"> struct WebNavigationDataStore;
</span><span class="cx">
</span><span class="cx"> class NavigationState final : private PageLoadState::Observer {
</span><span class="lines">@@ -86,7 +89,7 @@
</span><span class="cx"> virtual void didStartProvisionalNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
</span><span class="cx"> virtual void didReceiveServerRedirectForProvisionalNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
</span><span class="cx"> virtual void didFailProvisionalNavigationWithError(WebPageProxy&, WebFrameProxy&, API::Navigation*, const WebCore::ResourceError&, API::Object*) override;
</span><del>- virtual void didFailProvisionalLoadInSubframeWithError(WebPageProxy&, WebFrameProxy&, const SecurityOriginData&, API::Navigation*, const WebCore::ResourceError&, API::Object*) override;
</del><ins>+ virtual void didFailProvisionalLoadInSubframeWithError(WebPageProxy&, WebFrameProxy&, const WebCore::SecurityOriginData&, API::Navigation*, const WebCore::ResourceError&, API::Object*) override;
</ins><span class="cx"> virtual void didCommitNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
</span><span class="cx"> virtual void didFinishDocumentLoad(WebPageProxy&, API::Navigation*, API::Object*) override;
</span><span class="cx"> virtual void didFinishNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><span class="cx"> #import "NavigationActionData.h"
</span><span class="cx"> #import "PageLoadState.h"
</span><del>-#import "SecurityOriginData.h"
</del><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="cx"> #import "WKBackForwardListItemInternal.h"
</span><span class="cx"> #import "WKFrameInfoInternal.h"
</span><span class="lines">@@ -63,6 +62,7 @@
</span><span class="cx"> #import "_WKRenderingProgressEventsInternal.h"
</span><span class="cx"> #import "_WKSameDocumentNavigationTypeInternal.h"
</span><span class="cx"> #import <WebCore/Credential.h>
</span><ins>+#import <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // API::UIClient
</span><del>- virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
</del><ins>+ virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
</ins><span class="cx"> virtual void close(WebKit::WebPageProxy*) override;
</span><span class="cx"> virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) override;
</span><span class="cx"> virtual void didEnterFullscreen(WebKit::WebPageProxy*) override;
</span><span class="cx"> virtual void didExitFullscreen(WebKit::WebPageProxy*) override;
</span><del>- virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void ()> completionHandler) override;
- virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (bool)> completionHandler) override;
- virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (const WTF::String&)> completionHandler) override;
</del><ins>+ virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void ()> completionHandler) override;
+ virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void (bool)> completionHandler) override;
+ virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, std::function<void (const WTF::String&)> completionHandler) override;
</ins><span class="cx"> virtual void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, const WTF::String& databaseName, const WTF::String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentUsage, unsigned long long expectedUsage, std::function<void (unsigned long long)>) override;
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, std::function<void (unsigned long long)> completionHandler) override;
</span><span class="cx"> virtual void printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><span class="cx"> #import "NavigationActionData.h"
</span><del>-#import "SecurityOriginData.h"
</del><span class="cx"> #import "WKFrameInfoInternal.h"
</span><span class="cx"> #import "WKNavigationActionInternal.h"
</span><span class="cx"> #import "WKSecurityOriginInternal.h"
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx"> #import "WKWindowFeaturesInternal.h"
</span><span class="cx"> #import "WKUIDelegatePrivate.h"
</span><span class="cx"> #import "_WKFrameHandleInternal.h"
</span><ins>+#import <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebKit::WebPageProxy> UIDelegate::UIClient::createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy* initiatingFrame, const WebKit::SecurityOriginData& securityOriginData, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, const WebKit::NavigationActionData& navigationActionData)
</del><ins>+PassRefPtr<WebKit::WebPageProxy> UIDelegate::UIClient::createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy* initiatingFrame, const WebCore::SecurityOriginData& securityOriginData, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, const WebKit::NavigationActionData& navigationActionData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> return webView->_page.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIDelegate::UIClient::runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler)
</del><ins>+void UIDelegate::UIClient::runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebCore::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler) {
</span><span class="cx"> completionHandler();
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIDelegate::UIClient::runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler)
</del><ins>+void UIDelegate::UIClient::runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebCore::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler) {
</span><span class="cx"> completionHandler(false);
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIDelegate::UIClient::runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& defaultValue, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void (const WTF::String&)> completionHandler)
</del><ins>+void UIDelegate::UIClient::runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& defaultValue, WebKit::WebFrameProxy* webFrameProxy, const WebCore::SecurityOriginData& securityOriginData, std::function<void (const WTF::String&)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler) {
</span><span class="cx"> completionHandler(String());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #include "LocalStorageDatabase.h"
</span><span class="cx"> #include "LocalStorageDatabaseTracker.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "StorageAreaMapMessages.h"
</span><span class="cx"> #include "StorageManagerMessages.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <WebCore/StorageMap.h>
</span><span class="cx"> #include <WebCore/TextEncoding.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class SecurityOrigin;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct SecurityOriginData;
</del><span class="cx"> class LocalStorageDatabaseTracker;
</span><span class="cx"> class WebProcessProxy;
</span><span class="cx">
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> virtual void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>& replyEncoder) override;
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><del>- void createLocalStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
- void createTransientLocalStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& topLevelOriginData, const SecurityOriginData&);
- void createSessionStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
</del><ins>+ void createLocalStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, const WebCore::SecurityOriginData&);
+ void createTransientLocalStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, const WebCore::SecurityOriginData& topLevelOriginData, const WebCore::SecurityOriginData&);
+ void createSessionStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, const WebCore::SecurityOriginData&);
</ins><span class="cx"> void destroyStorageMap(IPC::Connection&, uint64_t storageMapID);
</span><span class="cx">
</span><span class="cx"> void getValues(IPC::Connection&, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> StorageManager {
</span><del>- CreateLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebKit::SecurityOriginData securityOriginData) WantsConnection
- CreateTransientLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebKit::SecurityOriginData topLevelSecurityOriginData, struct WebKit::SecurityOriginData securityOriginData) WantsConnection
- CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebKit::SecurityOriginData securityOriginData) WantsConnection
</del><ins>+ CreateLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebCore::SecurityOriginData securityOriginData) WantsConnection
+ CreateTransientLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebCore::SecurityOriginData topLevelSecurityOriginData, struct WebCore::SecurityOriginData securityOriginData) WantsConnection
+ CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebCore::SecurityOriginData securityOriginData) WantsConnection
</ins><span class="cx"> DestroyStorageMap(uint64_t storageMapID) WantsConnection
</span><span class="cx">
</span><span class="cx"> GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<String, String> values) WantsConnection
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebScriptMessageHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebScriptMessageHandler.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebScriptMessageHandler.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebScriptMessageHandler.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> class SerializedScriptValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -43,7 +44,6 @@
</span><span class="cx">
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebFrameProxy;
</span><del>-struct SecurityOriginData;
</del><span class="cx">
</span><span class="cx"> struct WebScriptMessageHandlerHandle {
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> class Client {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Client() { }
</span><del>- virtual void didPostMessage(WebPageProxy&, WebFrameProxy&, const SecurityOriginData&, WebCore::SerializedScriptValue&) = 0;
</del><ins>+ virtual void didPostMessage(WebPageProxy&, WebFrameProxy&, const WebCore::SecurityOriginData&, WebCore::SerializedScriptValue&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebScriptMessageHandler> create(std::unique_ptr<Client>, const String& name);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebUserContentControllerProxy::didPostMessage(IPC::Connection& connection, uint64_t pageID, uint64_t frameID, const SecurityOriginData& securityOrigin, uint64_t messageHandlerID, const IPC::DataReference& dataReference)
</del><ins>+void WebUserContentControllerProxy::didPostMessage(IPC::Connection& connection, uint64_t pageID, uint64_t frameID, const WebCore::SecurityOriginData& securityOrigin, uint64_t messageHandlerID, const IPC::DataReference& dataReference)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = WebProcessProxy::webPage(pageID);
</span><span class="cx"> if (!page)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -50,13 +50,13 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class UserScript;
</span><span class="cx"> class UserStyleSheet;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebProcessProxy;
</span><span class="cx"> class WebScriptMessageHandler;
</span><del>-struct SecurityOriginData;
</del><span class="cx">
</span><span class="cx"> class WebUserContentControllerProxy : public API::ObjectImpl<API::Object::Type::UserContentController>, private IPC::MessageReceiver {
</span><span class="cx"> public:
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> // IPC::MessageReceiver.
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><del>- void didPostMessage(IPC::Connection&, uint64_t pageID, uint64_t frameID, const SecurityOriginData&, uint64_t messageHandlerID, const IPC::DataReference&);
</del><ins>+ void didPostMessage(IPC::Connection&, uint64_t pageID, uint64_t frameID, const WebCore::SecurityOriginData&, uint64_t messageHandlerID, const IPC::DataReference&);
</ins><span class="cx">
</span><span class="cx"> uint64_t m_identifier;
</span><span class="cx"> HashSet<WebProcessProxy*> m_processes;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -24,5 +24,5 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> messages -> WebUserContentControllerProxy {
</span><del>- DidPostMessage(uint64_t pageID, uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, uint64_t messageHandlerID, IPC::DataReference message) WantsConnection
</del><ins>+ DidPostMessage(uint64_t pageID, uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t messageHandlerID, IPC::DataReference message) WantsConnection
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APISecurityOrigin.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "WebCookieManagerMessages.h"
</span><span class="cx"> #include "WebCookieManagerProxyMessages.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -157,6 +157,7 @@
</span><span class="cx"> class TextIndicator;
</span><span class="cx"> struct DictionaryPopupInfo;
</span><span class="cx"> struct FileChooserSettings;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> struct TextAlternativeWithRange;
</span><span class="cx"> struct TextCheckingResult;
</span><span class="cx"> struct ViewportAttributes;
</span><span class="lines">@@ -206,7 +207,6 @@
</span><span class="cx"> struct EditorState;
</span><span class="cx"> struct PlatformPopupMenuData;
</span><span class="cx"> struct PrintInfo;
</span><del>-struct SecurityOriginData;
</del><span class="cx"> struct WebPopupItem;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="lines">@@ -1099,7 +1099,7 @@
</span><span class="cx"> void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, const UserData&);
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, const UserData&);
</span><span class="cx"> void didChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, const String& url);
</span><del>- void didFailProvisionalLoadForFrame(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const String& provisionalURL, const WebCore::ResourceError&, const UserData&);
</del><ins>+ void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const String& provisionalURL, const WebCore::ResourceError&, const UserData&);
</ins><span class="cx"> void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, bool containsPluginDocument, const UserData&);
</span><span class="cx"> void didFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
</span><span class="cx"> void didFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, const UserData&);
</span><span class="lines">@@ -1121,10 +1121,10 @@
</span><span class="cx">
</span><span class="cx"> void didDestroyNavigation(uint64_t navigationID);
</span><span class="cx">
</span><del>- void decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID);
- void decidePolicyForNewWindowAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, const UserData&);
- void decidePolicyForResponse(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
- void decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
</del><ins>+ void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID);
+ void decidePolicyForNewWindowAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, const UserData&);
+ void decidePolicyForResponse(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
+ void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
</ins><span class="cx"> void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, const UserData&);
</span><span class="cx">
</span><span class="cx"> void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, const UserData&);
</span><span class="lines">@@ -1136,12 +1136,12 @@
</span><span class="cx"> void didUpdateHistoryTitle(const String& title, const String& url, uint64_t frameID);
</span><span class="cx">
</span><span class="cx"> // UI client
</span><del>- void createNewPage(uint64_t frameID, const SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const NavigationActionData&, uint64_t& newPageID, WebPageCreationParameters&);
</del><ins>+ void createNewPage(uint64_t frameID, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const NavigationActionData&, uint64_t& newPageID, WebPageCreationParameters&);
</ins><span class="cx"> void showPage();
</span><span class="cx"> void closePage(bool stopResponsivenessTimer);
</span><del>- void runJavaScriptAlert(uint64_t frameID, const SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
- void runJavaScriptConfirm(uint64_t frameID, const SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
- void runJavaScriptPrompt(uint64_t frameID, const SecurityOriginData&, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
</del><ins>+ void runJavaScriptAlert(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
+ void runJavaScriptConfirm(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
+ void runJavaScriptPrompt(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
</ins><span class="cx"> void setStatusText(const String&);
</span><span class="cx"> void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, const UserData&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -22,12 +22,12 @@
</span><span class="cx">
</span><span class="cx"> messages -> WebPageProxy {
</span><span class="cx"> # UI messages
</span><del>- CreateNewPage(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, WebCore::ResourceRequest request, struct WebCore::WindowFeatures windowFeatures, struct WebKit::NavigationActionData navigationActionData) -> (uint64_t newPageID, struct WebKit::WebPageCreationParameters newPageParameters)
</del><ins>+ CreateNewPage(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, WebCore::ResourceRequest request, struct WebCore::WindowFeatures windowFeatures, struct WebKit::NavigationActionData navigationActionData) -> (uint64_t newPageID, struct WebKit::WebPageCreationParameters newPageParameters)
</ins><span class="cx"> ShowPage()
</span><span class="cx"> ClosePage(bool stopResponsivenessTimer)
</span><del>- RunJavaScriptAlert(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, String message) -> () Delayed
- RunJavaScriptConfirm(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, String message) -> (bool result) Delayed
- RunJavaScriptPrompt(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, String message, String defaultValue) -> (String result) Delayed
</del><ins>+ RunJavaScriptAlert(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message) -> () Delayed
+ RunJavaScriptConfirm(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message) -> (bool result) Delayed
+ RunJavaScriptPrompt(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, String message, String defaultValue) -> (String result) Delayed
</ins><span class="cx"> MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::UserData userData)
</span><span class="cx">
</span><span class="cx"> DidBeginTrackingPotentialLongMousePress(WebCore::IntPoint mouseDownPosition, WebKit::WebHitTestResult::Data hitTestResultData, WebKit::UserData userData)
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Policy messages
</span><del>- DecidePolicyForResponseSync(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID)
- DecidePolicyForNavigationAction(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, struct WebKit::SecurityOriginData originatingFrameSecurityOrigin, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID)
- DecidePolicyForNewWindowAction(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
</del><ins>+ DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID)
+ DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, struct WebCore::SecurityOriginData originatingFrameSecurityOrigin, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID)
+ DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
</ins><span class="cx"> UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)
</span><span class="cx">
</span><span class="cx"> # Progress messages
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::UserData userData)
</span><span class="cx"> DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::UserData userData)
</span><span class="cx"> DidChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, String url)
</span><del>- DidFailProvisionalLoadForFrame(uint64_t frameID, struct WebKit::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, String provisionalURL, WebCore::ResourceError error, WebKit::UserData userData)
</del><ins>+ DidFailProvisionalLoadForFrame(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, String provisionalURL, WebCore::ResourceError error, WebKit::UserData userData)
</ins><span class="cx"> DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, bool containsPluginDocument, WebKit::UserData userData)
</span><span class="cx"> DidFailLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceError error, WebKit::UserData userData)
</span><span class="cx"> DidFinishDocumentLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -728,8 +728,6 @@
</span><span class="cx"> 330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934531315B9750097A7BC /* WebCookieManagerProxy.h */; };
</span><span class="cx"> 3309345A1315B9980097A7BC /* WKCookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934581315B9980097A7BC /* WKCookieManager.cpp */; };
</span><span class="cx"> 3309345B1315B9980097A7BC /* WKCookieManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934591315B9980097A7BC /* WKCookieManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 33152975130D0CB200ED2483 /* SecurityOriginData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33152973130D0CB200ED2483 /* SecurityOriginData.cpp */; };
- 33152976130D0CB200ED2483 /* SecurityOriginData.h in Headers */ = {isa = PBXBuildFile; fileRef = 33152974130D0CB200ED2483 /* SecurityOriginData.h */; };
</del><span class="cx"> 3336763A130C99DC006C9DE2 /* WKResourceCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33367638130C99DC006C9DE2 /* WKResourceCacheManager.cpp */; };
</span><span class="cx"> 3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33AA1064131F060000D4A575 /* WebCookieManagerProxyClient.cpp */; };
</span><span class="lines">@@ -2883,8 +2881,6 @@
</span><span class="cx"> 330934541315B9750097A7BC /* WebCookieManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebCookieManagerProxy.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 330934581315B9980097A7BC /* WKCookieManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKCookieManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 330934591315B9980097A7BC /* WKCookieManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCookieManager.h; sourceTree = "<group>"; };
</span><del>- 33152973130D0CB200ED2483 /* SecurityOriginData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityOriginData.cpp; sourceTree = "<group>"; };
- 33152974130D0CB200ED2483 /* SecurityOriginData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityOriginData.h; sourceTree = "<group>"; };
</del><span class="cx"> 33367638130C99DC006C9DE2 /* WKResourceCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKResourceCacheManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKResourceCacheManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 33AA1064131F060000D4A575 /* WebCookieManagerProxyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCookieManagerProxyClient.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4728,8 +4724,6 @@
</span><span class="cx"> BC2D021612AC41CB00E732A3 /* SameDocumentNavigationType.h */,
</span><span class="cx"> 1AAB4A8C1296F0A20023952F /* SandboxExtension.h */,
</span><span class="cx"> E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */,
</span><del>- 33152973130D0CB200ED2483 /* SecurityOriginData.cpp */,
- 33152974130D0CB200ED2483 /* SecurityOriginData.h */,
</del><span class="cx"> 1AFDE6571954A42B00C48FFA /* SessionState.cpp */,
</span><span class="cx"> 1AFDE6581954A42B00C48FFA /* SessionState.h */,
</span><span class="cx"> 753E3E0B1887397300188496 /* SessionTracker.cpp */,
</span><span class="lines">@@ -7838,7 +7832,6 @@
</span><span class="cx"> E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */,
</span><span class="cx"> E18E690C169B563F009B6670 /* SecItemShimProxy.h in Headers */,
</span><span class="cx"> E18E6918169B667B009B6670 /* SecItemShimProxyMessages.h in Headers */,
</span><del>- 33152976130D0CB200ED2483 /* SecurityOriginData.h in Headers */,
</del><span class="cx"> 514D9F5719119D35000063A7 /* ServicesController.h in Headers */,
</span><span class="cx"> 1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */,
</span><span class="cx"> 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
</span><span class="lines">@@ -9660,7 +9653,6 @@
</span><span class="cx"> E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */,
</span><span class="cx"> E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */,
</span><span class="cx"> E18E6917169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp in Sources */,
</span><del>- 33152975130D0CB200ED2483 /* SecurityOriginData.cpp in Sources */,
</del><span class="cx"> 514D9F5819119D35000063A7 /* ServicesController.mm in Sources */,
</span><span class="cx"> 1AFDE6591954A42B00C48FFA /* SessionState.cpp in Sources */,
</span><span class="cx"> 1A002D48196B345D00B9AD44 /* SessionStateCoding.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx"> #include "DatabaseProcessIDBConnectionMessages.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnectionMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebToDatabaseProcessConnection.h"
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><span class="cx"> #include <WebCore/IDBKeyRangeData.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaCacheWebMediaKeyStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebMediaKeyStorageManager.h"
</span><span class="cx">
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaCacheWebMediaKeyStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -31,9 +31,12 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+struct SecurityOriginData;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct SecurityOriginData;
</del><span class="cx"> class WebProcess;
</span><span class="cx">
</span><span class="cx"> class WebMediaKeyStorageManager : public WebProcessSupplement {
</span><span class="lines">@@ -45,10 +48,10 @@
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span><span class="cx"> const String& mediaKeyStorageDirectory() const { return m_mediaKeyStorageDirectory; }
</span><del>- String mediaKeyStorageDirectoryForOrigin(const SecurityOriginData&);
</del><ins>+ String mediaKeyStorageDirectoryForOrigin(const WebCore::SecurityOriginData&);
</ins><span class="cx">
</span><del>- Vector<SecurityOriginData> getMediaKeyOrigins();
- void deleteMediaKeyEntriesForOrigin(const SecurityOriginData&);
</del><ins>+ Vector<WebCore::SecurityOriginData> getMediaKeyOrigins();
+ void deleteMediaKeyEntriesForOrigin(const WebCore::SecurityOriginData&);
</ins><span class="cx"> void deleteMediaKeyEntriesModifiedBetweenDates(double startDate, double endDate);
</span><span class="cx"> void deleteAllMediaKeyEntries();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageAreaMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageAreaMap.h"
</span><span class="cx">
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "StorageAreaImpl.h"
</span><span class="cx"> #include "StorageAreaMapMessages.h"
</span><span class="cx"> #include "StorageManagerMessages.h"
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx"> #include <WebCore/MainFrame.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/PageGroup.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/Storage.h>
</span><span class="cx"> #include <WebCore/StorageEventDispatcher.h>
</span><span class="cx"> #include <WebCore/StorageMap.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebUserContentController.h"
</span><span class="cx">
</span><span class="cx"> #include "DataReference.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "WebCompiledContentExtension.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="lines">@@ -36,6 +35,7 @@
</span><span class="cx"> #include "WebUserContentControllerProxyMessages.h"
</span><span class="cx"> #include <WebCore/DOMWrapperWorld.h>
</span><span class="cx"> #include <WebCore/ScriptController.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/SerializedScriptValue.h>
</span><span class="cx"> #include <WebCore/UserStyleSheet.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::singleton().parentProcessConnection()->send(Messages::WebUserContentControllerProxy::DidPostMessage(webPage->pageID(), webFrame->frameID(), SecurityOriginData::fromFrame(webFrame), m_identifier, IPC::DataReference(value->data())), m_controller->identifier());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebUserContentControllerProxy::DidPostMessage(webPage->pageID(), webFrame->frameID(), SecurityOriginData::fromFrame(frame), m_identifier, IPC::DataReference(value->data())), m_controller->identifier());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::UserMessageHandlerDescriptor& descriptor() { return *m_descriptor; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PageBanner.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "UserData.h"
</span><span class="cx"> #include "WebColorChooser.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="lines">@@ -73,6 +72,7 @@
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/ScriptController.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "InjectedBundleNavigationAction.h"
</span><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PluginView.h"
</span><del>-#include "SecurityOriginData.h"
</del><span class="cx"> #include "UserData.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WebBackForwardListProxy.h"
</span><span class="lines">@@ -77,6 +76,7 @@
</span><span class="cx"> #include <WebCore/ProgressTracker.h>
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ScriptController.h>
</span><ins>+#include <WebCore/SecurityOriginData.h>
</ins><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx"> #include <WebCore/SubframeLoader.h>
</span><span class="cx"> #include <WebCore/UIEventWithKeyState.h>
</span><span class="lines">@@ -494,7 +494,8 @@
</span><span class="cx"> navigationID = static_cast<WebDocumentLoader*>(documentLoader)->navigationID();
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), SecurityOriginData::fromFrame(m_frame), navigationID, m_frame->coreFrame()->loader().provisionalLoadErrorBeingHandledURL(), error, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ WebCore::Frame* coreFrame = m_frame ? m_frame->coreFrame() : nullptr;
+ webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, m_frame->coreFrame()->loader().provisionalLoadErrorBeingHandledURL(), error, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx">
</span><span class="cx"> // If we have a load listener, notify it.
</span><span class="cx"> if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
</span><span class="lines">@@ -700,7 +701,9 @@
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), SecurityOriginData::fromFrame(m_frame), response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags)) {
</del><ins>+
+ WebCore::Frame* coreFrame = m_frame ? m_frame->coreFrame() : nullptr;
+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags)) {
</ins><span class="cx"> m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -740,7 +743,8 @@
</span><span class="cx"> navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
</span><span class="cx"> navigationActionData.shouldOpenExternalURLsPolicy = navigationAction.shouldOpenExternalURLsPolicy();
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), SecurityOriginData::fromFrame(m_frame), navigationActionData, request, frameName, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ WebCore::Frame* coreFrame = m_frame ? m_frame->coreFrame() : nullptr;
+ webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationActionData, request, frameName, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState> prpFormState, FramePolicyFunction function)
</span><span class="lines">@@ -810,7 +814,8 @@
</span><span class="cx"> documentLoader = static_cast<WebDocumentLoader*>(coreFrame->loader().documentLoader());
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(m_frame), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, SecurityOriginData::fromFrame(originatingFrame.get()), navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID))) {
</del><ins>+ WebCore::Frame* originatingCoreFrame = originatingFrame ? originatingFrame->coreFrame() : nullptr;
+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, SecurityOriginData::fromFrame(originatingCoreFrame), navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID))) {
</ins><span class="cx"> function(PolicyIgnore);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -1189,7 +1189,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidDeleteWebsiteData(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, const Vector<WebKit::SecurityOriginData>& originDatas, uint64_t callbackID)
</del><ins>+void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& originDatas, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> class PageGroup;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> struct PluginInfo;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -79,7 +80,6 @@
</span><span class="cx"> class WebPage;
</span><span class="cx"> class WebPageGroupProxy;
</span><span class="cx"> class WebProcessSupplement;
</span><del>-struct SecurityOriginData;
</del><span class="cx"> struct WebPageCreationParameters;
</span><span class="cx"> struct WebPageGroupData;
</span><span class="cx"> struct WebPreferencesStore;
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><del>- void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebKit::SecurityOriginData>& origins, uint64_t callbackID);
</del><ins>+ void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> void setIgnoreTLSErrors(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (189312 => 189313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-09-03 23:33:42 UTC (rev 189312)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-09-03 23:34:53 UTC (rev 189313)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</span><span class="cx"> DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><del>- DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebKit::SecurityOriginData> origins, uint64_t callbackID)
</del><ins>+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>