Diff
Modified: trunk/Source/WebKit2/ChangeLog (192930 => 192931)
--- trunk/Source/WebKit2/ChangeLog 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-02 01:10:24 UTC (rev 192931)
@@ -1,3 +1,19 @@
+2015-12-01 Anders Carlsson <[email protected]>
+
+ Remove WKOriginDataManager
+ https://bugs.webkit.org/show_bug.cgi?id=151723
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/API/C/WKOriginDataManager.cpp: Removed.
+ (WKOriginDataManagerGetTypeID): Deleted.
+ (WKOriginDataManagerGetOrigins): Deleted.
+ (WKOriginDataManagerDeleteEntriesForOrigin): Deleted.
+ (WKOriginDataManagerDeleteEntriesModifiedBetweenDates): Deleted.
+ (WKOriginDataManagerDeleteAllEntries): Deleted.
+ * UIProcess/API/C/WKOriginDataManager.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-12-01 Yusuke Suzuki <[email protected]>
[ES6] Implement LLInt/Baseline Support for ES6 Generators and enable this feature
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (192930 => 192931)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-02 01:10:24 UTC (rev 192931)
@@ -124,7 +124,6 @@
typedef const struct OpaqueWKNotificationProvider* WKNotificationProviderRef;
typedef const struct OpaqueWKOpenPanelParameters* WKOpenPanelParametersRef;
typedef const struct OpaqueWKOpenPanelResultListener* WKOpenPanelResultListenerRef;
-typedef const struct OpaqueWKOriginDataManager* WKOriginDataManagerRef;
typedef const struct OpaqueWKPage* WKPageRef;
typedef const struct OpaqueWKPageConfiguration* WKPageConfigurationRef;
typedef const struct OpaqueWKPageGroup* WKPageGroupRef;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (192930 => 192931)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-12-02 01:10:24 UTC (rev 192931)
@@ -474,11 +474,6 @@
return reinterpret_cast<WKResourceCacheManagerRef>(WKContextGetWebsiteDataStore(context));
}
-WKOriginDataManagerRef WKContextGetOriginDataManager(WKContextRef context)
-{
- return reinterpret_cast<WKOriginDataManagerRef>(toAPI(toImpl(context)->websiteDataStore()));
-}
-
void WKContextStartMemorySampler(WKContextRef contextRef, WKDoubleRef interval)
{
toImpl(contextRef)->startMemorySampler(toImpl(interval)->value());
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (192930 => 192931)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-12-02 01:10:24 UTC (rev 192931)
@@ -136,7 +136,6 @@
WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);
WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context);
-WK_EXPORT WKOriginDataManagerRef WKContextGetOriginDataManager(WKContextRef context);
typedef void (*WKContextGetStatisticsFunction)(WKDictionaryRef statistics, WKErrorRef error, void* functionContext);
WK_EXPORT void WKContextGetStatistics(WKContextRef context, void* functionContext, WKContextGetStatisticsFunction function);
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp (192930 => 192931)
--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2015-12-02 01:10:24 UTC (rev 192931)
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2013 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 "WKOriginDataManager.h"
-
-#include "APIWebsiteDataStore.h"
-#include "WKAPICast.h"
-#include "WebsiteDataRecord.h"
-
-using namespace WebKit;
-
-WKTypeID WKOriginDataManagerGetTypeID()
-{
- return toAPI(API::WebsiteDataStore::APIType);
-}
-
-void WKOriginDataManagerGetOrigins(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, void* context, WKOriginDataManagerGetOriginsFunction callback)
-{
- // This is the only type supported.
- ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
-
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
- websiteDataStore.fetchData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
- Vector<RefPtr<API::Object>> securityOrigins;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& origin : dataRecord.origins)
- securityOrigins.append(API::SecurityOrigin::create(*origin));
- }
-
- callback(toAPI(API::Array::create(WTF::move(securityOrigins)).ptr()), nullptr, context);
- });
-}
-
-void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, WKSecurityOriginRef origin, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
-{
- // This is the only type supported.
- ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
-
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
-
- WebsiteDataRecord dataRecord;
- dataRecord.add(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, &toImpl(origin)->securityOrigin());
-
- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, { dataRecord }, [context, callback] {
- callback(nullptr, context);
- });
-}
-
-void WKOriginDataManagerDeleteEntriesModifiedBetweenDates(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, double startDate, double endDate, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
-{
- // This is the only type supported.
- ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
- UNUSED_PARAM(endDate);
-
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, std::chrono::system_clock::from_time_t(startDate), [context, callback] {
- callback(nullptr, context);
- });
-}
-
-void WKOriginDataManagerDeleteAllEntries(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
-{
- // This is the only type supported.
- ASSERT_UNUSED(types, types == kWKIndexedDatabaseData);
-
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(originDataManager))->websiteDataStore();
- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases, std::chrono::system_clock::time_point::min(), [context, callback] {
- callback(nullptr, context);
- });
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h (192930 => 192931)
--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h 2015-12-02 01:10:24 UTC (rev 192931)
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2013 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 WKOriginDataManager_h
-#define WKOriginDataManager_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
- kWKApplicationCacheOriginData = 1 << 0,
- kWKCookieOriginData = 1 << 1,
- kWKIndexedDatabaseData = 1 << 2,
- kWKKeyValueStorageOriginData = 1 << 3,
- kWKMediaCacheOriginData = 1 << 4,
- kWKPluginDataOriginData = 1 << 5,
- kWKResourceCacheOriginData = 1 << 6,
- kWKWebSQLDatabaseOriginData = 1 << 7,
- kWKMediaKeyStorageOriginData = 1 << 8,
-
- kWKAllOriginData = 0xFFFFFFFF
-};
-typedef uint32_t WKOriginDataTypes;
-
-WK_EXPORT WKTypeID WKOriginDataManagerGetTypeID();
-
-typedef void (*WKOriginDataManagerGetOriginsFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKOriginDataManagerGetOrigins(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, void* context, WKOriginDataManagerGetOriginsFunction function);
-
-typedef void (*WKOriginDataManagerDeleteEntriesCallbackFunction)(WKErrorRef, void*);
-WK_EXPORT void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, WKSecurityOriginRef origin, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction function);
-WK_EXPORT void WKOriginDataManagerDeleteEntriesModifiedBetweenDates(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, double startDate, double endDate, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction function);
-WK_EXPORT void WKOriginDataManagerDeleteAllEntries(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction function);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKOriginDataManager_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (192930 => 192931)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-02 01:10:24 UTC (rev 192931)
@@ -862,7 +862,6 @@
4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */; };
51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */; };
- 510274321981AF8E008165ED /* WKOriginDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
51032F18180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */; };
51032F19180F73BB00961BB7 /* WebToDatabaseProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */; };
51032F1D180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */; };
@@ -1070,7 +1069,6 @@
728E86F21795188C0087879E /* WebColorPickerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 728E86F01795188C0087879E /* WebColorPickerMac.mm */; };
753E3E0D1887398500188496 /* SessionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 753E3E0B1887397300188496 /* SessionTracker.cpp */; };
753E3E0E1887398900188496 /* SessionTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 753E3E091887394B00188496 /* SessionTracker.h */; };
- 755422BD18062BB20046F6A8 /* WKOriginDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */; };
75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */; };
75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */; };
@@ -3286,8 +3284,6 @@
728E86F01795188C0087879E /* WebColorPickerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebColorPickerMac.mm; sourceTree = "<group>"; };
753E3E091887394B00188496 /* SessionTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionTracker.h; sourceTree = "<group>"; };
753E3E0B1887397300188496 /* SessionTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionTracker.cpp; sourceTree = "<group>"; };
- 755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKOriginDataManager.cpp; sourceTree = "<group>"; };
- 755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOriginDataManager.h; sourceTree = "<group>"; };
75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataStore.h; sourceTree = "<group>"; };
75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebsiteDataStore.mm; sourceTree = "<group>"; };
75A8D2D0187D17BF00C39C9E /* WKSessionRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSessionRef.cpp; sourceTree = "<group>"; };
@@ -6446,8 +6442,6 @@
BC857FE412B843D800EDEB2E /* WKOpenPanelParameters.h */,
BC1DFE8E12B31CA8005DF730 /* WKOpenPanelResultListener.cpp */,
BC1DFE8D12B31CA8005DF730 /* WKOpenPanelResultListener.h */,
- 755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */,
- 755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */,
BCD597D4112B56DC00EC8C23 /* WKPage.cpp */,
BCD597D5112B56DC00EC8C23 /* WKPage.h */,
7C89D2991A67837B003A5FDE /* WKPageConfigurationRef.cpp */,
@@ -8375,7 +8369,6 @@
378E1A40181EDA010031007A /* WKObject.h in Headers */,
BC857FE612B843D800EDEB2E /* WKOpenPanelParameters.h in Headers */,
BC1DFE8F12B31CA8005DF730 /* WKOpenPanelResultListener.h in Headers */,
- 510274321981AF8E008165ED /* WKOriginDataManager.h in Headers */,
BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */,
7C89D29C1A67837B003A5FDE /* WKPageConfigurationRef.h in Headers */,
1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */,
@@ -10136,7 +10129,6 @@
374436881820E7240049579F /* WKObject.mm in Sources */,
BC85806312B8505700EDEB2E /* WKOpenPanelParameters.cpp in Sources */,
BC85806212B8505700EDEB2E /* WKOpenPanelResultListener.cpp in Sources */,
- 755422BD18062BB20046F6A8 /* WKOriginDataManager.cpp in Sources */,
BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */,
7C89D29B1A67837B003A5FDE /* WKPageConfigurationRef.cpp in Sources */,
BC7B633812A45ABA00D174A4 /* WKPageGroup.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h (192930 => 192931)
--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h 2015-12-02 00:57:41 UTC (rev 192930)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h 2015-12-02 01:10:24 UTC (rev 192931)
@@ -26,7 +26,6 @@
#ifndef WebMediaKeyStorageManager_h
#define WebMediaKeyStorageManager_h
-#include "WKOriginDataManager.h"
#include "WebProcessSupplement.h"
#include <wtf/Noncopyable.h>
#include <wtf/text/WTFString.h>
