[EME] Pass location for media key storage through from WebKit/WebKit2.
https://bugs.webkit.org/show_bug.cgi?id=137120
Reviewed by Anders Carlsson.
Allow the location for media key storage to be passed into the WebProcess from the UIProcess
through the WebContextConfiguraiton struct.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode): Add mediaKeysStorageDirectory.
(WebKit::WebProcessCreationParameters::decode): Ditto.
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/C/WKContextConfigurationRef.cpp:
(WKContextConfigurationCopyMediaKeysStorageDirectory): Added getter.
(WKContextConfigurationSetMediaKeysStorageDirectory): Added setter.
* UIProcess/API/C/WKContextConfigurationRef.h:
* UIProcess/API/C/WKOriginDataManager.h:
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _initWithConfiguration:]): Provide a default location.
* UIProcess/APIContextConfiguration.cpp:
(API::ContextConfiguration::webContextConfiguration): Set mediaKeysStorageDirectory.
* UIProcess/APIContextConfiguration.h:
(API::ContextConfiguration::mediaKeysStorageDirectory): Added getter.
(API::ContextConfiguration::setMediaKeysStorageDirectory): Added setter.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::applyPlatformSpecificConfigurationDefaults): Apply mediaKeysStorageDirectory.
(WebKit::WebContext::WebContext): Initialize m_mediaKeysStorageDirectory.
(WebKit::WebContext::createNewWebProcess): Create a sandbox extension handle for mediaKeysStorageDirectory.
* UIProcess/WebContext.h:
* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::platformDefaultMediaKeysStorageDirectory): Return a default location.
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformDefaultMediaKeysStorageDirectory): Ditto.
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultMediaKeysStorageDirectory): Return an overridable default location.
* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp: Added.
(WebKit::WebMediaKeyStorageManager::initialize): Pull the mediaKeysStorageDirectory out of configuration.
(WebKit::WebMediaKeyStorageManager::supplementName): Return a configuration name.
(WebKit::WebMediaKeyStorageManager::mediaKeyStorageDirectoryForOrigin): Return the
correct storage directory based on the SecureOrigin.
(WebKit::WebMediaKeyStorageManager::getMediaKeyOrigins): Return the origins within the
storage directory.
(WebKit::removeAllMediaKeyStorageForOriginPath): Static, remove contents and directory at path.
(WebKit::WebMediaKeyStorageManager::deleteMediaKeyEntriesForOrigin): Use
removeAllMediaKeyStorageForOriginPath to remove origin data.
(WebKit::WebMediaKeyStorageManager::deleteMediaKeyEntriesModifiedBetweenDates): Ditto.
(WebKit::WebMediaKeyStorageManager::deleteAllMediaKeyEntries): Ditto.
* WebProcess/MediaCache/WebMediaKeyStorageManager.h: Added.
(WebKit::WebMediaKeyStorageManager::WebMediaKeyStorageManager): Default constructor.
(WebKit::WebMediaKeyStorageManager::~WebMediaKeyStorageManager): Default virtual destructor.
(WebKit::WebMediaKeyStorageManager::mediaKeyStorageDirectory): Simple accessor.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess): Add WebMediaKeyStorageManager as a supplement.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess): Create a sandbox extension from the sandbox extension handle.
Add new source files to project(s).
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
(WebKit::WebMediaKeyStorageManager::getMediaKeyOrigins):
(WebKit::removeAllMediaKeyStorageForOriginPath):
Drive-by fix: references to VoidCallback are ambiguous, since the same name is re-used in multiple namespaces.
Make references to WebCore::VoidCallback explicit where the entire WebCore (and other) namespaces are pulled in.
* WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
(WebKit::NotificationPermissionRequestManager::startRequest):
(WebKit::NotificationPermissionRequestManager::didReceiveNotificationPermissionDecision):
* WebProcess/WebCoreSupport/WebNotificationClient.cpp:
(WebKit::WebNotificationClient::requestPermission):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@175288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 23031dd..b3b481c 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,79 @@
+2014-10-28 Jer Noble <jer.noble@apple.com>
+
+ [EME] Pass location for media key storage through from WebKit/WebKit2.
+ https://bugs.webkit.org/show_bug.cgi?id=137120
+
+ Reviewed by Anders Carlsson.
+
+ Allow the location for media key storage to be passed into the WebProcess from the UIProcess
+ through the WebContextConfiguraiton struct.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode): Add mediaKeysStorageDirectory.
+ (WebKit::WebProcessCreationParameters::decode): Ditto.
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/WKContextConfigurationRef.cpp:
+ (WKContextConfigurationCopyMediaKeysStorageDirectory): Added getter.
+ (WKContextConfigurationSetMediaKeysStorageDirectory): Added setter.
+ * UIProcess/API/C/WKContextConfigurationRef.h:
+ * UIProcess/API/C/WKOriginDataManager.h:
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _initWithConfiguration:]): Provide a default location.
+ * UIProcess/APIContextConfiguration.cpp:
+ (API::ContextConfiguration::webContextConfiguration): Set mediaKeysStorageDirectory.
+ * UIProcess/APIContextConfiguration.h:
+ (API::ContextConfiguration::mediaKeysStorageDirectory): Added getter.
+ (API::ContextConfiguration::setMediaKeysStorageDirectory): Added setter.
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::applyPlatformSpecificConfigurationDefaults): Apply mediaKeysStorageDirectory.
+ (WebKit::WebContext::WebContext): Initialize m_mediaKeysStorageDirectory.
+ (WebKit::WebContext::createNewWebProcess): Create a sandbox extension handle for mediaKeysStorageDirectory.
+ * UIProcess/WebContext.h:
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::platformDefaultMediaKeysStorageDirectory): Return a default location.
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformDefaultMediaKeysStorageDirectory): Ditto.
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultMediaKeysStorageDirectory): Return an overridable default location.
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp: Added.
+ (WebKit::WebMediaKeyStorageManager::initialize): Pull the mediaKeysStorageDirectory out of configuration.
+ (WebKit::WebMediaKeyStorageManager::supplementName): Return a configuration name.
+ (WebKit::WebMediaKeyStorageManager::mediaKeyStorageDirectoryForOrigin): Return the
+ correct storage directory based on the SecureOrigin.
+ (WebKit::WebMediaKeyStorageManager::getMediaKeyOrigins): Return the origins within the
+ storage directory.
+ (WebKit::removeAllMediaKeyStorageForOriginPath): Static, remove contents and directory at path.
+ (WebKit::WebMediaKeyStorageManager::deleteMediaKeyEntriesForOrigin): Use
+ removeAllMediaKeyStorageForOriginPath to remove origin data.
+ (WebKit::WebMediaKeyStorageManager::deleteMediaKeyEntriesModifiedBetweenDates): Ditto.
+ (WebKit::WebMediaKeyStorageManager::deleteAllMediaKeyEntries): Ditto.
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.h: Added.
+ (WebKit::WebMediaKeyStorageManager::WebMediaKeyStorageManager): Default constructor.
+ (WebKit::WebMediaKeyStorageManager::~WebMediaKeyStorageManager): Default virtual destructor.
+ (WebKit::WebMediaKeyStorageManager::mediaKeyStorageDirectory): Simple accessor.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess): Add WebMediaKeyStorageManager as a supplement.
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess): Create a sandbox extension from the sandbox extension handle.
+
+ Add new source files to project(s).
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+ (WebKit::WebMediaKeyStorageManager::getMediaKeyOrigins):
+ (WebKit::removeAllMediaKeyStorageForOriginPath):
+
+ Drive-by fix: references to VoidCallback are ambiguous, since the same name is re-used in multiple namespaces.
+ Make references to WebCore::VoidCallback explicit where the entire WebCore (and other) namespaces are pulled in.
+
+ * WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
+ (WebKit::NotificationPermissionRequestManager::startRequest):
+ (WebKit::NotificationPermissionRequestManager::didReceiveNotificationPermissionDecision):
+ * WebProcess/WebCoreSupport/WebNotificationClient.cpp:
+ (WebKit::WebNotificationClient::requestPermission):
+
2014-10-28 Jeremy Jones <jeremyj@apple.com>
Add optimized fullscreen mode.
diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index 5759c54..73aab15 100644
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -184,6 +184,8 @@
WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp
+ WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
+
WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
index 903e9fa..18748c6 100644
--- a/Source/WebKit2/PlatformGTK.cmake
+++ b/Source/WebKit2/PlatformGTK.cmake
@@ -278,6 +278,8 @@
WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
+ WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
+
WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
index fe6a232..836b864 100644
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
@@ -73,6 +73,8 @@
encoder << containerTemporaryDirectoryExtensionHandle;
encoder << hstsDatabasePathExtensionHandle;
#endif
+ encoder << mediaKeyStorageDirectory;
+ encoder << mediaKeyStorageDirectoryExtensionHandle;
encoder << shouldUseTestingNetworkSession;
encoder << urlSchemesRegistererdAsEmptyDocument;
encoder << urlSchemesRegisteredAsSecure;
@@ -171,6 +173,10 @@
if (!decoder.decode(parameters.hstsDatabasePathExtensionHandle))
return false;
#endif
+ if (!decoder.decode(parameters.mediaKeyStorageDirectory))
+ return false;
+ if (!decoder.decode(parameters.mediaKeyStorageDirectoryExtensionHandle))
+ return false;
if (!decoder.decode(parameters.shouldUseTestingNetworkSession))
return false;
if (!decoder.decode(parameters.urlSchemesRegistererdAsEmptyDocument))
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.h b/Source/WebKit2/Shared/WebProcessCreationParameters.h
index 11fb298..f40e68c 100644
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.h
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.h
@@ -78,6 +78,8 @@
// FIXME: Remove this once <rdar://problem/17726660> is fixed.
SandboxExtension::Handle hstsDatabasePathExtensionHandle;
#endif
+ SandboxExtension::Handle mediaKeyStorageDirectoryExtensionHandle;
+ String mediaKeyStorageDirectory;
bool shouldUseTestingNetworkSession;
diff --git a/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp b/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp
index f7d256a..28c28f1 100644
--- a/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp
@@ -75,3 +75,13 @@
{
toImpl(configuration)->setWebSQLDatabaseDirectory(toImpl(webSQLDatabaseDirectory)->string());
}
+
+WKStringRef WKContextConfigurationCopyMediaKeysStorageDirectory(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->mediaKeysStorageDirectory());
+}
+
+void WKContextConfigurationSetMediaKeysStorageDirectory(WKContextConfigurationRef configuration, WKStringRef mediaKeysStorageDirectory)
+{
+ toImpl(configuration)->setMediaKeysStorageDirectory(toImpl(mediaKeysStorageDirectory)->string());
+}
diff --git a/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h b/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h
index 754d49a..1e59eab 100644
--- a/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h
+++ b/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h
@@ -46,6 +46,9 @@
WK_EXPORT WKStringRef WKContextConfigurationCopyWebSQLDatabaseDirectory(WKContextConfigurationRef configuration);
WK_EXPORT void WKContextConfigurationSetWebSQLDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef webSQLDatabaseDirectory);
+WK_EXPORT WKStringRef WKContextConfigurationCopyMediaKeysStorageDirectory(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetMediaKeysStorageDirectory(WKContextConfigurationRef configuration, WKStringRef mediaKeysStorageDirectory);
+
#ifdef __cplusplus
}
#endif
diff --git a/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h b/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h
index cce46f5..1ae20fa 100644
--- a/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h
+++ b/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h
@@ -41,6 +41,7 @@
kWKPluginDataOriginData = 1 << 5,
kWKResourceCacheOriginData = 1 << 6,
kWKWebSQLDatabaseOriginData = 1 << 7,
+ kWKMediaKeyStorageOriginData = 1 << 8,
kWKAllOriginData = 0xFFFFFFFF
};
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm
index cc71a1a..9f82ff0 100644
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm
@@ -174,6 +174,7 @@
webContextConfiguration.localStorageDirectory = websiteDataDirectoryURL(@"LocalStorage").absoluteURL.path.fileSystemRepresentation;
webContextConfiguration.webSQLDatabaseDirectory = websiteDataDirectoryURL(@"WebSQL").absoluteURL.path.fileSystemRepresentation;
webContextConfiguration.indexedDBDatabaseDirectory = websiteDataDirectoryURL(@"IndexedDB").absoluteURL.path.fileSystemRepresentation;
+ webContextConfiguration.mediaKeysStorageDirectory = websiteDataDirectoryURL(@"MediaKeys").absoluteURL.path.fileSystemRepresentation;
API::Object::constructInWrapper<WebKit::WebContext>(self, WTF::move(webContextConfiguration));
_context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
diff --git a/Source/WebKit2/UIProcess/APIContextConfiguration.cpp b/Source/WebKit2/UIProcess/APIContextConfiguration.cpp
index 6ee1a89..403bd9d 100644
--- a/Source/WebKit2/UIProcess/APIContextConfiguration.cpp
+++ b/Source/WebKit2/UIProcess/APIContextConfiguration.cpp
@@ -46,6 +46,7 @@
configuration.injectedBundlePath = m_injectedBundlePath;
configuration.localStorageDirectory = m_localStorageDirectory;
configuration.webSQLDatabaseDirectory = m_webSQLDatabaseDirectory;
+ configuration.mediaKeysStorageDirectory = m_mediaKeysStorageDirectory;
WebKit::WebContext::applyPlatformSpecificConfigurationDefaults(configuration);
diff --git a/Source/WebKit2/UIProcess/APIContextConfiguration.h b/Source/WebKit2/UIProcess/APIContextConfiguration.h
index bcec1f4..9547c8a 100644
--- a/Source/WebKit2/UIProcess/APIContextConfiguration.h
+++ b/Source/WebKit2/UIProcess/APIContextConfiguration.h
@@ -55,6 +55,9 @@
String webSQLDatabaseDirectory() const { return m_webSQLDatabaseDirectory; }
void setWebSQLDatabaseDirectory(const String& webSQLDatabaseDirectory) { m_webSQLDatabaseDirectory = webSQLDatabaseDirectory; }
+ String mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
+ void setMediaKeysStorageDirectory(const String& mediaKeysStorageDirectory) { m_mediaKeysStorageDirectory = mediaKeysStorageDirectory; }
+
WebKit::WebContextConfiguration webContextConfiguration() const;
private:
@@ -64,6 +67,7 @@
String m_injectedBundlePath;
String m_localStorageDirectory;
String m_webSQLDatabaseDirectory;
+ String m_mediaKeysStorageDirectory;
};
} // namespace API
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index 4cb83da..cfbf33f 100644
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -128,6 +128,9 @@
// *********
if (!configuration.indexedDBDatabaseDirectory)
configuration.indexedDBDatabaseDirectory = platformDefaultIndexedDBDatabaseDirectory();
+
+ if (!configuration.mediaKeysStorageDirectory)
+ configuration.mediaKeysStorageDirectory = platformDefaultMediaKeysStorageDirectory();
}
PassRefPtr<WebContext> WebContext::create(WebContextConfiguration configuration)
@@ -170,6 +173,7 @@
#endif
, m_webSQLDatabaseDirectory(WTF::move(configuration.webSQLDatabaseDirectory))
, m_indexedDBDatabaseDirectory(WTF::move(configuration.indexedDBDatabaseDirectory))
+ , m_mediaKeysStorageDirectory(WTF::move(configuration.mediaKeysStorageDirectory))
, m_shouldUseTestingNetworkSession(false)
, m_processTerminationEnabled(true)
#if ENABLE(NETWORK_PROCESS)
@@ -628,6 +632,10 @@
SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
#endif
+ parameters.mediaKeyStorageDirectory = m_mediaKeysStorageDirectory;
+ if (!parameters.mediaKeyStorageDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(parameters.mediaKeyStorageDirectory, parameters.mediaKeyStorageDirectoryExtensionHandle);
+
parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
parameters.cacheModel = m_cacheModel;
diff --git a/Source/WebKit2/UIProcess/WebContext.h b/Source/WebKit2/UIProcess/WebContext.h
index 06d254e5..8f0c8f0 100644
--- a/Source/WebKit2/UIProcess/WebContext.h
+++ b/Source/WebKit2/UIProcess/WebContext.h
@@ -100,6 +100,7 @@
String localStorageDirectory;
String webSQLDatabaseDirectory;
String indexedDBDatabaseDirectory;
+ String mediaKeysStorageDirectory;
};
class WebContext : public API::ObjectImpl<API::Object::Type::Context>, private IPC::MessageReceiver
@@ -416,6 +417,7 @@
static String platformDefaultLocalStorageDirectory();
static String platformDefaultIndexedDBDatabaseDirectory();
static String platformDefaultWebSQLDatabaseDirectory();
+ static String platformDefaultMediaKeysStorageDirectory();
String diskCacheDirectory() const;
String platformDefaultDiskCacheDirectory() const;
@@ -529,6 +531,7 @@
String m_webSQLDatabaseDirectory;
String m_indexedDBDatabaseDirectory;
+ String m_mediaKeysStorageDirectory;
bool m_shouldUseTestingNetworkSession;
diff --git a/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp b/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp
index 4d9160d..1039942 100644
--- a/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp
+++ b/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp
@@ -121,6 +121,11 @@
return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/LocalStorage";
}
+String WebContext::platformDefaultMediaKeysStorageDirectory()
+{
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/MediaKeys";
+}
+
String WebContext::platformDefaultDiskCacheDirectory() const
{
return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
diff --git a/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
index 77975db..0b51666 100644
--- a/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
@@ -136,6 +136,12 @@
return WebCore::filenameToString(storageDirectory.get());
}
+String WebContext::platformDefaultMediaKeysStorageDirectory()
+{
+ GUniquePtr<gchar> mediaKeysStorageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "mediakeys", nullptr));
+ return WebCore::filenameToString(mediaKeysStorageDirectory.get());
+}
+
String WebContext::platformDefaultDiskCacheDirectory() const
{
GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
diff --git a/Source/WebKit2/UIProcess/mac/WebContextMac.mm b/Source/WebKit2/UIProcess/mac/WebContextMac.mm
index 80fdad2..4a39df1 100644
--- a/Source/WebKit2/UIProcess/mac/WebContextMac.mm
+++ b/Source/WebKit2/UIProcess/mac/WebContextMac.mm
@@ -76,6 +76,7 @@
NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault";
NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
NSString *WebKitJSCFTLJITEnabledDefaultsKey = @"WebKitJSCFTLJITEnabledDefaultsKey";
+NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @"WebKitMediaKeysStorageDirectory";
#if !PLATFORM(IOS)
static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
@@ -379,6 +380,14 @@
return stringByResolvingSymlinksInPath([localStorageDirectory stringByStandardizingPath]);
}
+String WebContext::platformDefaultMediaKeysStorageDirectory()
+{
+ NSString *mediaKeysStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaKeysStorageDirectoryDefaultsKey];
+ if (!mediaKeysStorageDirectory || ![mediaKeysStorageDirectory isKindOfClass:[NSString class]])
+ mediaKeysStorageDirectory = @"~/Library/WebKit/MediaKeys";
+ return stringByResolvingSymlinksInPath([mediaKeysStorageDirectory stringByStandardizingPath]);
+}
+
bool WebContext::omitPDFSupport()
{
// Since this is a "secret default" we don't bother registering it.
diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 4d2b610..a86243d 100644
--- a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -1581,6 +1581,8 @@
C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */; };
C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */; };
C5FA1ED418E1062200B3F402 /* WKAirPlayRoutePicker.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */; };
+ CD003A5219D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */; };
+ CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */; };
CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */; };
CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */; };
CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */; };
@@ -3672,6 +3674,8 @@
C59C4A5718B81174007BDCB6 /* AssistedNodeInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssistedNodeInformation.h; sourceTree = "<group>"; };
C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKAirPlayRoutePicker.h; path = ios/forms/WKAirPlayRoutePicker.h; sourceTree = "<group>"; };
C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKAirPlayRoutePicker.mm; path = ios/forms/WKAirPlayRoutePicker.mm; sourceTree = "<group>"; };
+ CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMediaKeyStorageManager.cpp; path = MediaCache/WebMediaKeyStorageManager.cpp; sourceTree = "<group>"; };
+ CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebMediaKeyStorageManager.h; path = MediaCache/WebMediaKeyStorageManager.h; sourceTree = "<group>"; };
CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageFullScreenClient.cpp; sourceTree = "<group>"; };
CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageFullScreenClient.h; sourceTree = "<group>"; };
CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageDiagnosticLoggingClient.cpp; sourceTree = "<group>"; };
@@ -4972,6 +4976,8 @@
33D3A3BE133960B000709BE4 /* WebMediaCacheManager.cpp */,
33D3A3BF133960B000709BE4 /* WebMediaCacheManager.h */,
33D3A3C0133960B000709BE4 /* WebMediaCacheManager.messages.in */,
+ CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */,
+ CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */,
);
name = MediaCache;
sourceTree = "<group>";
@@ -7070,6 +7076,7 @@
37BEC4E119491486008B4286 /* CompletionHandlerCallChecker.h in Headers */,
BCEE966D112FAF57006BCC24 /* Attachment.h in Headers */,
1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */,
+ CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */,
E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */,
51BA24441858EE3000EA2811 /* AsyncTask.h in Headers */,
7C85FD8019341665000177C4 /* WebPreferencesKeys.h in Headers */,
@@ -9426,6 +9433,7 @@
BC407601124FF0270068F20A /* WKNumber.cpp in Sources */,
7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */,
1ABC3DF51899E437004F0626 /* NavigationState.mm in Sources */,
+ CD003A5219D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp in Sources */,
BC85806312B8505700EDEB2E /* WKOpenPanelParameters.cpp in Sources */,
BC85806212B8505700EDEB2E /* WKOpenPanelResultListener.cpp in Sources */,
3F418EFB1887BD97002795FD /* WebVideoFullscreenManagerProxyMessageReceiver.cpp in Sources */,
diff --git a/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp b/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
new file mode 100644
index 0000000..60748c6
--- /dev/null
+++ b/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2014 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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 "WebMediaKeyStorageManager.h"
+
+#include "SecurityOriginData.h"
+#include "WebProcessCreationParameters.h"
+#include <WebCore/FileSystem.h>
+#include <WebCore/SecurityOrigin.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebMediaKeyStorageManager::initialize(const WebProcessCreationParameters ¶meters)
+{
+ ASSERT(!parameters.mediaKeyStorageDirectory.isEmpty());
+ m_mediaKeyStorageDirectory = parameters.mediaKeyStorageDirectory;
+}
+
+const char* WebMediaKeyStorageManager::supplementName()
+{
+ return "WebMediaKeyStorageManager";
+}
+
+String WebMediaKeyStorageManager::mediaKeyStorageDirectoryForOrigin(const SecurityOriginData& originData)
+{
+ if (!m_mediaKeyStorageDirectory)
+ return emptyString();
+
+ return pathByAppendingComponent(m_mediaKeyStorageDirectory, originData.securityOrigin()->databaseIdentifier());
+}
+
+Vector<SecurityOriginData> WebMediaKeyStorageManager::getMediaKeyOrigins()
+{
+ Vector<SecurityOriginData> results;
+
+ if (m_mediaKeyStorageDirectory.isEmpty())
+ return results;
+
+ Vector<String> originPaths = listDirectory(m_mediaKeyStorageDirectory, "*");
+ for (const auto& originPath : originPaths) {
+ URL url;
+ url.setProtocol(ASCIILiteral("file"));
+ url.setPath(originPath);
+
+ String mediaKeyIdentifier = url.lastPathComponent();
+
+ RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::maybeCreateFromDatabaseIdentifier(mediaKeyIdentifier);
+ if (!securityOrigin)
+ continue;
+
+ results.append(SecurityOriginData::fromSecurityOrigin(securityOrigin.get()));
+ }
+
+ return results;
+}
+
+static void removeAllMediaKeyStorageForOriginPath(const String& originPath, double startDate, double endDate)
+{
+ Vector<String> mediaKeyPaths = listDirectory(originPath, "*");
+
+ for (const auto& mediaKeyPath : mediaKeyPaths) {
+ String mediaKeyFile = pathByAppendingComponent(mediaKeyPath, "SecureStop.plist");
+
+ if (!fileExists(mediaKeyFile))
+ continue;
+
+ time_t modTime;
+ getFileModificationTime(mediaKeyFile, modTime);
+
+ if (modTime < startDate || modTime > endDate)
+ continue;
+
+ deleteFile(mediaKeyFile);
+ deleteEmptyDirectory(mediaKeyPath);
+ }
+
+ deleteEmptyDirectory(originPath);
+}
+
+void WebMediaKeyStorageManager::deleteMediaKeyEntriesForOrigin(const SecurityOriginData& originData)
+{
+ if (m_mediaKeyStorageDirectory.isEmpty())
+ return;
+
+ String originPath = mediaKeyStorageDirectoryForOrigin(originData);
+ removeAllMediaKeyStorageForOriginPath(originPath, std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
+}
+
+void WebMediaKeyStorageManager::deleteMediaKeyEntriesModifiedBetweenDates(double startDate, double endDate)
+{
+ if (m_mediaKeyStorageDirectory.isEmpty())
+ return;
+
+ Vector<String> originPaths = listDirectory(m_mediaKeyStorageDirectory, "*");
+ for (auto& originPath : originPaths)
+ removeAllMediaKeyStorageForOriginPath(originPath, startDate, endDate);
+}
+
+void WebMediaKeyStorageManager::deleteAllMediaKeyEntries()
+{
+ if (m_mediaKeyStorageDirectory.isEmpty())
+ return;
+
+ Vector<String> originPaths = listDirectory(m_mediaKeyStorageDirectory, "*");
+ for (auto& originPath : originPaths)
+ removeAllMediaKeyStorageForOriginPath(originPath, std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
+}
+
+}
diff --git a/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h b/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h
new file mode 100644
index 0000000..dcb2178
--- /dev/null
+++ b/Source/WebKit2/WebProcess/MediaCache/WebMediaKeyStorageManager.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2014 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * 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 WebMediaKeyStorageManager_h
+#define WebMediaKeyStorageManager_h
+
+#include "WKOriginDataManager.h"
+#include "WebProcessSupplement.h"
+#include <wtf/Noncopyable.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+struct SecurityOriginData;
+class WebProcess;
+
+class WebMediaKeyStorageManager : public WebProcessSupplement {
+ WTF_MAKE_NONCOPYABLE(WebMediaKeyStorageManager);
+public:
+ explicit WebMediaKeyStorageManager(WebProcess*) { }
+ virtual ~WebMediaKeyStorageManager() { }
+
+ static const char* supplementName();
+
+ const String& mediaKeyStorageDirectory() const { return m_mediaKeyStorageDirectory; }
+ String mediaKeyStorageDirectoryForOrigin(const SecurityOriginData&);
+
+ Vector<SecurityOriginData> getMediaKeyOrigins();
+ void deleteMediaKeyEntriesForOrigin(const SecurityOriginData&);
+ void deleteMediaKeyEntriesModifiedBetweenDates(double startDate, double endDate);
+ void deleteAllMediaKeyEntries();
+
+private:
+ virtual void initialize(const WebProcessCreationParameters&);
+
+ String m_mediaKeyStorageDirectory;
+};
+
+}
+
+#endif
diff --git a/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp b/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
index 0c137a6..2b1218b 100644
--- a/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
+++ b/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
@@ -84,7 +84,7 @@
#endif
#if ENABLE(LEGACY_NOTIFICATIONS)
-void NotificationPermissionRequestManager::startRequest(SecurityOrigin* origin, PassRefPtr<VoidCallback> callback)
+void NotificationPermissionRequestManager::startRequest(SecurityOrigin* origin, PassRefPtr<WebCore::VoidCallback> callback)
{
NotificationClient::Permission permission = permissionLevel(origin);
if (permission != NotificationClient::PermissionNotAllowed) {
@@ -162,7 +162,7 @@
WebProcess::shared().supplement<WebNotificationManager>()->didUpdateNotificationDecision(origin->toString(), allowed);
#if ENABLE(LEGACY_NOTIFICATIONS)
- RefPtr<VoidCallback> voidCallback = m_idToVoidCallbackMap.take(requestID);
+ RefPtr<WebCore::VoidCallback> voidCallback = m_idToVoidCallbackMap.take(requestID);
if (voidCallback) {
voidCallback->handleEvent();
return;
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp
index f4cf125..62ff8fb 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp
@@ -73,7 +73,7 @@
}
#if ENABLE(LEGACY_NOTIFICATIONS)
-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<WebCore::VoidCallback> callback)
{
m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), callback);
}
diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp
index afdeaee..0a65fde 100644
--- a/Source/WebKit2/WebProcess/WebProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebProcess.cpp
@@ -48,7 +48,9 @@
#include "WebGeolocationManager.h"
#include "WebIconDatabaseProxy.h"
#include "WebMediaCacheManager.h"
+#include "WebMediaKeyStorageManager.h"
#include "WebMemorySampler.h"
+#include "WebOriginDataManager.h"
#include "WebPage.h"
#include "WebPageCreationParameters.h"
#include "WebPageGroupProxyMessages.h"
@@ -174,6 +176,7 @@
, m_hasRichContentServices(false)
#endif
, m_nonVisibleProcessCleanupTimer(this, &WebProcess::nonVisibleProcessCleanupTimerFired)
+ , m_webOriginDataManager(std::make_unique<WebOriginDataManager>(*this, *this))
{
// Initialize our platform strategies.
WebPlatformStrategies::initialize();
@@ -198,6 +201,9 @@
#if ENABLE(BATTERY_STATUS)
addSupplement<WebBatteryManager>();
#endif
+#if ENABLE(ENCRYPTED_MEDIA_V2)
+ addSupplement<WebMediaKeyStorageManager>();
+#endif
m_plugInAutoStartOriginHashes.add(SessionID::defaultSessionID(), HashMap<unsigned, double>());
}
@@ -1246,4 +1252,71 @@
}
#endif
+void WebProcess::getOrigins(WKOriginDataTypes types, std::function<void(const Vector<SecurityOriginData>&)> completion)
+{
+ if (!(types & kWKWebSQLDatabaseOriginData)) {
+ completion(Vector<SecurityOriginData>());
+ return;
+ }
+
+ WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
+ if (!manager) {
+ completion(Vector<SecurityOriginData>());
+ return;
+ }
+
+ completion(manager->getMediaKeyOrigins());
+}
+
+void WebProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void()> completion)
+{
+ if (!(types & kWKWebSQLDatabaseOriginData)) {
+ completion();
+ return;
+ }
+
+ WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
+ if (!manager) {
+ completion();
+ return;
+ }
+
+ manager->deleteMediaKeyEntriesForOrigin(origin);
+ completion();
+}
+
+void WebProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void()> completion)
+{
+ if (!(types & kWKWebSQLDatabaseOriginData)) {
+ completion();
+ return;
+ }
+
+ WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
+ if (!manager) {
+ completion();
+ return;
+ }
+
+ manager->deleteMediaKeyEntriesModifiedBetweenDates(startDate, endDate);
+ completion();
+}
+
+void WebProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void()> completion)
+{
+ if (!(types & kWKWebSQLDatabaseOriginData)) {
+ completion();
+ return;
+ }
+
+ WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
+ if (!manager) {
+ completion();
+ return;
+ }
+
+ manager->deleteAllMediaKeyEntries();
+ completion();
+}
+
} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h
index f186486..88c581a 100644
--- a/Source/WebKit2/WebProcess/WebProcess.h
+++ b/Source/WebKit2/WebProcess/WebProcess.h
@@ -37,6 +37,7 @@
#include "TextCheckerState.h"
#include "ViewUpdateDispatcher.h"
#include "VisitedLinkTable.h"
+#include "WebOriginDataManagerSupplement.h"
#include <WebCore/SessionIDHash.h>
#include <WebCore/Timer.h>
#include <wtf/Forward.h>
@@ -69,6 +70,7 @@
class WebConnectionToUIProcess;
class WebFrame;
class WebIconDatabaseProxy;
+class WebOriginDataManager;
class WebPage;
class WebPageGroupProxy;
class WebProcessSupplement;
@@ -86,7 +88,7 @@
class WebToDatabaseProcessConnection;
#endif
-class WebProcess : public ChildProcess, private DownloadManager::Client {
+class WebProcess : public ChildProcess, public WebOriginDataManagerSupplement, private DownloadManager::Client {
friend class NeverDestroyed<DownloadManager>;
public:
static WebProcess& shared();
@@ -288,6 +290,12 @@
// Implemented in generated WebProcessMessageReceiver.cpp
void didReceiveWebProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
+ // WebOriginDataManagerSupplement
+ virtual void getOrigins(WKOriginDataTypes, std::function<void(const Vector<SecurityOriginData>&)> completion) override;
+ virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void()> completion) override;
+ virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void()> completion) override;
+ virtual void deleteAllEntries(WKOriginDataTypes, std::function<void()> completion) override;
+
RefPtr<WebConnectionToUIProcess> m_webConnection;
HashMap<uint64_t, RefPtr<WebPage>> m_pageMap;
@@ -353,6 +361,8 @@
HashSet<uint64_t> m_pagesInWindows;
WebCore::Timer<WebProcess> m_nonVisibleProcessCleanupTimer;
+
+ std::unique_ptr<WebOriginDataManager> m_webOriginDataManager;
};
} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
index 4dacefc..b1e5150 100644
--- a/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
+++ b/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
@@ -159,6 +159,7 @@
SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
+ SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
#if PLATFORM(IOS)
SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.openGLCacheDirectoryExtensionHandle);
