Diff
Modified: trunk/Source/WebKit2/ChangeLog (185630 => 185631)
--- 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)
@@ -1,3 +1,23 @@
+2015-06-16 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Unreviewed build fix attempt on CMake based port after r185623.
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (185630 => 185631)
--- 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)
@@ -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>
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (185630 => 185631)
--- 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)
@@ -32,6 +32,10 @@
#include "UniqueIDBDatabaseIdentifier.h"
#include <wtf/NeverDestroyed.h>
+namespace WebCore {
+class SessionID;
+}
+
namespace WebKit {
class AsyncTask;
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (185630 => 185631)
--- 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)
@@ -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>
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (185630 => 185631)
--- 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)
@@ -40,11 +40,17 @@
#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 {
Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (185630 => 185631)
--- 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)
@@ -81,26 +81,6 @@
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)
Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.h (185630 => 185631)
--- 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)
@@ -27,18 +27,19 @@
#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 WebCore {
+class SecurityOrigin;
+}
+
namespace WebKit {
-typedef GenericCallback<API::Array*> ArrayCallback;
-
struct SecurityOriginData {
static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin&);
Ref<WebCore::SecurityOrigin> securityOrigin() const;
@@ -56,8 +57,6 @@
SecurityOriginData isolatedCopy() const;
};
-void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>&, ArrayCallback*);
-
bool operator==(const SecurityOriginData&, const SecurityOriginData&);
} // namespace WebKit
Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp (185630 => 185631)
--- 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)
@@ -28,6 +28,7 @@
#include "ArgumentCoders.h"
#include "SecurityOriginData.h"
+#include <wtf/text/StringHash.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (185630 => 185631)
--- 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)
@@ -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>
Modified: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp (185630 => 185631)
--- 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)
@@ -30,6 +30,7 @@
#include "WebProcessCreationParameters.h"
#include <WebCore/FileSystem.h>
#include <WebCore/SecurityOrigin.h>
+#include <WebCore/URL.h>
using namespace WebCore;
