Diff
Modified: trunk/Source/WebKit2/ChangeLog (196941 => 196942)
--- trunk/Source/WebKit2/ChangeLog 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-22 18:22:27 UTC (rev 196942)
@@ -1,3 +1,22 @@
+2016-02-22 Anders Carlsson <[email protected]>
+
+ Get rid of WKPluginSiteDataManager
+ https://bugs.webkit.org/show_bug.cgi?id=154470
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/c/WKBase.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetPluginSiteDataManager): Deleted.
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp: Removed.
+ (WKPluginSiteDataManagerGetTypeID): Deleted.
+ (WKPluginSiteDataManagerGetSitesWithData): Deleted.
+ (WKPluginSiteDataManagerClearSiteData): Deleted.
+ (WKPluginSiteDataManagerClearAllSiteData): Deleted.
+ * UIProcess/API/C/WKPluginSiteDataManager.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-02-21 Brent Fulgham <[email protected]>
[WK2][Mac] Allow processes to set "fast-dev-casheable" bit
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (196941 => 196942)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-02-22 18:22:27 UTC (rev 196942)
@@ -125,7 +125,6 @@
typedef const struct OpaqueWKPage* WKPageRef;
typedef const struct OpaqueWKPageConfiguration* WKPageConfigurationRef;
typedef const struct OpaqueWKPageGroup* WKPageGroupRef;
-typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
typedef const struct OpaqueWKPreferences* WKPreferencesRef;
typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
typedef const struct OpaqueWKPageRunBeforeUnloadConfirmPanelResultListener* WKPageRunBeforeUnloadConfirmPanelResultListenerRef;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (196941 => 196942)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-02-22 18:22:27 UTC (rev 196942)
@@ -447,16 +447,6 @@
return toAPI(toImpl(contextRef)->supplement<WebNotificationManagerProxy>());
}
-WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- return reinterpret_cast<WKPluginSiteDataManagerRef>(WKContextGetWebsiteDataStore(context));
-#else
- UNUSED_PARAM(context);
- return nullptr;
-#endif
-}
-
WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context)
{
return reinterpret_cast<WKResourceCacheManagerRef>(WKContextGetWebsiteDataStore(context));
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (196941 => 196942)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-02-22 18:22:27 UTC (rev 196942)
@@ -150,7 +150,6 @@
WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
WK_EXPORT WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context);
WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
-WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);
WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context);
typedef void (*WKContextGetStatisticsFunction)(WKDictionaryRef statistics, WKErrorRef error, void* functionContext);
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (196941 => 196942)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2016-02-22 18:22:27 UTC (rev 196942)
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2011, 2012 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 "WKPluginSiteDataManager.h"
-
-#include "APIObject.h"
-#include "WKAPICast.h"
-#include "WebProcessPool.h"
-#include "WebsiteDataRecord.h"
-
-using namespace WebKit;
-
-WKTypeID WKPluginSiteDataManagerGetTypeID()
-{
- return toAPI(API::WebsiteDataStore::APIType);
-}
-
-void WKPluginSiteDataManagerGetSitesWithData(WKPluginSiteDataManagerRef manager, void* context, WKPluginSiteDataManagerGetSitesWithDataFunction callback)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(manager))->websiteDataStore();
- websiteDataStore.fetchData(WebsiteDataTypes::WebsiteDataTypePlugInData, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
- Vector<String> hostNames;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& hostName : dataRecord.pluginDataHostNames)
- hostNames.append(hostName);
- }
-
- callback(toAPI(API::Array::createStringArray(hostNames).ptr()), nullptr, context);
- });
-#else
- UNUSED_PARAM(manager);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
-}
-
-void WKPluginSiteDataManagerClearSiteData(WKPluginSiteDataManagerRef manager, WKArrayRef sites, WKClearSiteDataFlags flags, uint64_t maxAgeInSeconds, void* context, WKPluginSiteDataManagerClearSiteDataFunction callback)
-{
- // These are the only parameters supported.
- ASSERT_UNUSED(flags, flags == kWKClearSiteDataFlagsClearAll);
- ASSERT_UNUSED(maxAgeInSeconds, maxAgeInSeconds == std::numeric_limits<uint64_t>::max());
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
- WebsiteDataRecord dataRecord;
- for (const auto& string : toImpl(sites)->elementsOfType<API::String>())
- dataRecord.pluginDataHostNames.add(string->string());
-
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(manager))->websiteDataStore();
- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypePlugInData, { dataRecord }, [context, callback] {
- callback(nullptr, context);
- });
-#else
- UNUSED_PARAM(manager);
- UNUSED_PARAM(sites);
- UNUSED_PARAM(flags);
- UNUSED_PARAM(maxAgeInSeconds);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
-}
-
-void WKPluginSiteDataManagerClearAllSiteData(WKPluginSiteDataManagerRef manager, void* context, WKPluginSiteDataManagerClearSiteDataFunction callback)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(manager))->websiteDataStore();
- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypePlugInData, std::chrono::system_clock::time_point::min(), [context, callback] {
- callback(nullptr, context);
- });
-#else
- UNUSED_PARAM(manager);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h (196941 => 196942)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h 2016-02-22 18:22:27 UTC (rev 196942)
@@ -1,55 +0,0 @@
-/*
- * 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 WKPluginSiteDataManager_h
-#define WKPluginSiteDataManager_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKPluginSiteDataManagerGetTypeID();
-
-typedef void (*WKPluginSiteDataManagerGetSitesWithDataFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKPluginSiteDataManagerGetSitesWithData(WKPluginSiteDataManagerRef manager, void* context, WKPluginSiteDataManagerGetSitesWithDataFunction function);
-
-enum {
- kWKClearSiteDataFlagsClearAll = 0,
- kWKClearSiteDataFlagsClearCache = 1 << 0,
-};
-typedef uint64_t WKClearSiteDataFlags;
-
-typedef void (*WKPluginSiteDataManagerClearSiteDataFunction)(WKErrorRef, void*);
-
-WK_EXPORT void WKPluginSiteDataManagerClearSiteData(WKPluginSiteDataManagerRef manager, WKArrayRef sites, WKClearSiteDataFlags flags, uint64_t maxAgeInSeconds, void* context, WKPluginSiteDataManagerClearSiteDataFunction function);
-WK_EXPORT void WKPluginSiteDataManagerClearAllSiteData(WKPluginSiteDataManagerRef manager, void* context, WKPluginSiteDataManagerClearSiteDataFunction function);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKPluginSiteDataManager_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196941 => 196942)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-22 18:03:22 UTC (rev 196941)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-22 18:22:27 UTC (rev 196942)
@@ -437,8 +437,6 @@
1AC75380183BE50F0072CB15 /* DataReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC7537E183BE50F0072CB15 /* DataReference.h */; };
1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC75A1A1B3368270056745B /* HangDetectionDisabler.h */; };
1AC75A1E1B33695E0056745B /* HangDetectionDisablerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC75A1C1B33695E0056745B /* HangDetectionDisablerMac.mm */; };
- 1AC86FF3130B46D3002C1257 /* WKPluginSiteDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC86FF1130B46D3002C1257 /* WKPluginSiteDataManager.cpp */; };
- 1AC86FF4130B46D3002C1257 /* WKPluginSiteDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC86FF2130B46D3002C1257 /* WKPluginSiteDataManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
1ACC87BA1981C341003D1AF4 /* WKNavigationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACC87B91981C341003D1AF4 /* WKNavigationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1ACECD2417162DB1001FC9EF /* StorageAreaMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */; };
1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */; };
@@ -2397,8 +2395,6 @@
1AC7537E183BE50F0072CB15 /* DataReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataReference.h; sourceTree = "<group>"; };
1AC75A1A1B3368270056745B /* HangDetectionDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HangDetectionDisabler.h; sourceTree = "<group>"; };
1AC75A1C1B33695E0056745B /* HangDetectionDisablerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HangDetectionDisablerMac.mm; sourceTree = "<group>"; };
- 1AC86FF1130B46D3002C1257 /* WKPluginSiteDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPluginSiteDataManager.cpp; sourceTree = "<group>"; };
- 1AC86FF2130B46D3002C1257 /* WKPluginSiteDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPluginSiteDataManager.h; sourceTree = "<group>"; };
1ACC87B91981C341003D1AF4 /* WKNavigationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationPrivate.h; sourceTree = "<group>"; };
1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMap.cpp; sourceTree = "<group>"; };
1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMap.h; sourceTree = "<group>"; };
@@ -6103,8 +6099,6 @@
2DABA7711A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h */,
1AB8A1F118400B6200E9AE69 /* WKPageUIClient.h */,
2DABA7731A817EE600EF0F1A /* WKPluginLoadPolicy.h */,
- 1AC86FF1130B46D3002C1257 /* WKPluginSiteDataManager.cpp */,
- 1AC86FF2130B46D3002C1257 /* WKPluginSiteDataManager.h */,
BCD597CF112B56AC00EC8C23 /* WKPreferences.cpp */,
BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */,
762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */,
@@ -7951,7 +7945,6 @@
2DA1E4FE18C02B6A00DBC929 /* WKPDFView.h in Headers */,
7C135AA9173B0BCA00586AE2 /* WKPluginInformation.h in Headers */,
2DABA7741A817EE600EF0F1A /* WKPluginLoadPolicy.h in Headers */,
- 1AC86FF4130B46D3002C1257 /* WKPluginSiteDataManager.h in Headers */,
1AFDD3171891C94700153970 /* WKPreferences.h in Headers */,
1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */,
7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */,
@@ -9376,7 +9369,6 @@
2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */,
2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */,
7C135AA8173B0BCA00586AE2 /* WKPluginInformation.cpp in Sources */,
- 1AC86FF3130B46D3002C1257 /* WKPluginSiteDataManager.cpp in Sources */,
BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */,
1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */,
0FCB4E6718BBE3D9000FCFC9 /* WKPrintingView.mm in Sources */,
