Get rid of performAPICallbackWithSecurityOriginDataVector
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Jun 2015 01:06:56 +0000 (01:06 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Jun 2015 01:06:56 +0000 (01:06 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185631 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
Source/WebKit2/DatabaseProcess/DatabaseProcess.h
Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h
Source/WebKit2/Shared/SecurityOriginData.cpp
Source/WebKit2/Shared/SecurityOriginData.h
Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp
Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp

index ceae900..e656f3a 100644 (file)
@@ -1,3 +1,23 @@
+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:
+
 2015-06-16  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         Unreviewed build fix attempt on CMake based port after r185623.
index c7ef1ac..4c3103d 100644 (file)
@@ -38,6 +38,7 @@
 #include "WebsiteData.h"
 #include <WebCore/FileSystem.h>
 #include <WebCore/NotImplemented.h>
+#include <WebCore/SessionID.h>
 #include <WebCore/TextEncoding.h>
 #include <wtf/MainThread.h>
 
index 894cacc..59a618b 100644 (file)
 #include "UniqueIDBDatabaseIdentifier.h"
 #include <wtf/NeverDestroyed.h>
 
+namespace WebCore {
+class SessionID;
+}
+
 namespace WebKit {
 
 class AsyncTask;
index f7681e7..619805c 100644 (file)
@@ -41,6 +41,7 @@
 #include <WebCore/IDBGetResult.h>
 #include <WebCore/IDBKeyData.h>
 #include <WebCore/IDBKeyRangeData.h>
+#include <WebCore/SecurityOrigin.h>
 #include <wtf/MainThread.h>
 #include <wtf/text/WTFString.h>
 
index dc6b4f0..37d5576 100644 (file)
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
+namespace IPC {
+class DataReference;
+}
+
 namespace WebCore {
 class SharedBuffer;
 
 struct IDBDatabaseMetadata;
+struct IDBGetResult;
 struct IDBKeyData;
+struct IDBKeyRangeData;
 }
 
 namespace WebKit {
index 2dca601..85cc956 100644 (file)
@@ -81,26 +81,6 @@ SecurityOriginData SecurityOriginData::isolatedCopy() const
     return result;
 }
 
-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());
-}
-
 bool operator==(const SecurityOriginData& a, const SecurityOriginData& b)
 {
     if (&a == &b)
index 7461e87..47c2c66 100644 (file)
 #define SecurityOriginData_h
 
 #include "APIObject.h"
-#include "GenericCallback.h" // FIXME: This is a UIProcess file, and may not be included from Shared directory files.
 #include <wtf/text/WTFString.h>
 
 namespace IPC {
-    class ArgumentDecoder;
-    class ArgumentEncoder;
+class ArgumentDecoder;
+class ArgumentEncoder;
 }
 
-namespace WebKit {
+namespace WebCore {
+class SecurityOrigin;
+}
 
-typedef GenericCallback<API::Array*> ArrayCallback;
+namespace WebKit {
 
 struct SecurityOriginData {
     static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin&);
@@ -56,8 +57,6 @@ struct SecurityOriginData {
     SecurityOriginData isolatedCopy() const;
 };
 
-void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>&, ArrayCallback*);
-
 bool operator==(const SecurityOriginData&, const SecurityOriginData&);
 
 } // namespace WebKit
index 94a70ce..35a8427 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "ArgumentCoders.h"
 #include "SecurityOriginData.h"
+#include <wtf/text/StringHash.h>
 
 namespace WebKit {
 
index 0e07b2f..b042599 100644 (file)
@@ -35,6 +35,7 @@
 #include "DatabaseToWebProcessConnectionMessages.h"
 #include "Logging.h"
 #include "SecurityOriginData.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
 #include "WebToDatabaseProcessConnection.h"
 #include <WebCore/IDBDatabaseMetadata.h>
index 32cc705..a721a13 100644 (file)
@@ -30,6 +30,7 @@
 #include "WebProcessCreationParameters.h"
 #include <WebCore/FileSystem.h>
 #include <WebCore/SecurityOrigin.h>
+#include <WebCore/URL.h>
 
 using namespace WebCore;