<!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>[185631] trunk/Source/WebKit2</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/185631">185631</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 18:06:56 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of performAPICallbackWithSecurityOriginDataVector
https://bugs.webkit.org/show_bug.cgi?id=146039
Reviewed by Andreas Kling.
Get rid of performAPICallbackWithSecurityOriginDataVector since it's now no longer used
and add a bunch of includes to make up for SecurityOriginData.h no longer including GenericCallback.h.
* DatabaseProcess/DatabaseProcess.cpp:
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
* Shared/SecurityOriginData.cpp:
(WebKit::performAPICallbackWithSecurityOriginDataVector): Deleted.
* Shared/SecurityOriginData.h:
* Shared/WebsiteData/WebsiteData.cpp:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatacpp">trunk/Source/WebKit2/Shared/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatah">trunk/Source/WebKit2/Shared/SecurityOriginData.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/ChangeLog        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-16 Anders Carlsson <andersca@apple.com>
+
+ Get rid of performAPICallbackWithSecurityOriginDataVector
+ https://bugs.webkit.org/show_bug.cgi?id=146039
+
+ Reviewed by Andreas Kling.
+
+ Get rid of performAPICallbackWithSecurityOriginDataVector since it's now no longer used
+ and add a bunch of includes to make up for SecurityOriginData.h no longer including GenericCallback.h.
+ * DatabaseProcess/DatabaseProcess.cpp:
+ * DatabaseProcess/DatabaseProcess.h:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::performAPICallbackWithSecurityOriginDataVector): Deleted.
+ * Shared/SecurityOriginData.h:
+ * Shared/WebsiteData/WebsiteData.cpp:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+
</ins><span class="cx"> 2015-06-16 Ryuan Choi <ryuan.choi@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix attempt on CMake based port after r185623.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "WebsiteData.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx"> #include <WebCore/TextEncoding.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -32,6 +32,10 @@
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+class SessionID;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class AsyncTask;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include <WebCore/IDBGetResult.h>
</span><span class="cx"> #include <WebCore/IDBKeyData.h>
</span><span class="cx"> #include <WebCore/IDBKeyRangeData.h>
</span><ins>+#include <WebCore/SecurityOrigin.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -40,11 +40,17 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+namespace IPC {
+class DataReference;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><span class="cx"> struct IDBDatabaseMetadata;
</span><ins>+struct IDBGetResult;
</ins><span class="cx"> struct IDBKeyData;
</span><ins>+struct IDBKeyRangeData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -81,26 +81,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>& originDatas, ArrayCallback* callback)
-{
- if (!callback) {
- // FIXME: Log error or assert.
- return;
- }
-
- Vector<RefPtr<API::Object>> securityOrigins;
- securityOrigins.reserveInitialCapacity(originDatas.size());
-
- for (const auto& originData : originDatas) {
- RefPtr<API::Object> origin = API::SecurityOrigin::create(originData.protocol, originData.host, originData.port);
- if (!origin)
- continue;
- securityOrigins.uncheckedAppend(WTF::move(origin));
- }
-
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).ptr());
-}
-
</del><span class="cx"> bool operator==(const SecurityOriginData& a, const SecurityOriginData& b)
</span><span class="cx"> {
</span><span class="cx"> if (&a == &b)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.h (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.h        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.h        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -27,18 +27,19 @@
</span><span class="cx"> #define SecurityOriginData_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "GenericCallback.h" // FIXME: This is a UIProcess file, and may not be included from Shared directory files.
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><del>- class ArgumentDecoder;
- class ArgumentEncoder;
</del><ins>+class ArgumentDecoder;
+class ArgumentEncoder;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace WebCore {
+class SecurityOrigin;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-typedef GenericCallback<API::Array*> ArrayCallback;
-
</del><span class="cx"> struct SecurityOriginData {
</span><span class="cx"> static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin&);
</span><span class="cx"> Ref<WebCore::SecurityOrigin> securityOrigin() const;
</span><span class="lines">@@ -56,8 +57,6 @@
</span><span class="cx"> SecurityOriginData isolatedCopy() const;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>&, ArrayCallback*);
-
</del><span class="cx"> bool operator==(const SecurityOriginData&, const SecurityOriginData&);
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "SecurityOriginData.h"
</span><ins>+#include <wtf/text/StringHash.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "DatabaseToWebProcessConnectionMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SecurityOriginData.h"
</span><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebToDatabaseProcessConnection.h"
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaCacheWebMediaKeyStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp (185630 => 185631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp        2015-06-17 00:59:31 UTC (rev 185630)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp        2015-06-17 01:06:56 UTC (rev 185631)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><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/URL.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>