Diff
Modified: trunk/Source/WebCore/ChangeLog (199320 => 199321)
--- trunk/Source/WebCore/ChangeLog 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/ChangeLog 2016-04-11 23:46:07 UTC (rev 199321)
@@ -1,3 +1,17 @@
+2016-04-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r199315.
+ https://bugs.webkit.org/show_bug.cgi?id=156482
+
+ This change broke the OS X Yosemite build. (Requested by jwtan
+ on #webkit).
+
+ Reverted changeset:
+
+ "When clearing cache, also clear AVFoundation cache."
+ https://bugs.webkit.org/show_bug.cgi?id=155783
+ http://trac.webkit.org/changeset/199315
+
2016-04-11 Brian Burg <[email protected]>
Web Inspector: get rid of InspectorBasicValue and InspectorString subclasses
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (199320 => 199321)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -5593,38 +5593,23 @@
else
document().decrementLoadEventDelayCount();
}
+
-static String& sharedMediaCacheDirectory()
+void HTMLMediaElement::getSitesInMediaCache(Vector<String>& sites)
{
- static NeverDestroyed<String> sharedMediaCacheDirectory;
- return sharedMediaCacheDirectory;
+ MediaPlayer::getSitesInMediaCache(sites);
}
-void HTMLMediaElement::setMediaCacheDirectory(const String& path)
+void HTMLMediaElement::clearMediaCache()
{
- sharedMediaCacheDirectory() = path;
+ MediaPlayer::clearMediaCache();
}
-const String& HTMLMediaElement::mediaCacheDirectory()
+void HTMLMediaElement::clearMediaCacheForSite(const String& site)
{
- return sharedMediaCacheDirectory();
+ MediaPlayer::clearMediaCacheForSite(site);
}
-HashSet<RefPtr<SecurityOrigin>> HTMLMediaElement::originsInMediaCache(const String& path)
-{
- return MediaPlayer::originsInMediaCache(path);
-}
-
-void HTMLMediaElement::clearMediaCache(const String& path, std::chrono::system_clock::time_point modifiedSince)
-{
- MediaPlayer::clearMediaCache(path, modifiedSince);
-}
-
-void HTMLMediaElement::clearMediaCacheForOrigins(const String& path, const HashSet<RefPtr<SecurityOrigin>>& origins)
-{
- MediaPlayer::clearMediaCacheForOrigins(path, origins);
-}
-
void HTMLMediaElement::resetMediaEngines()
{
MediaPlayer::resetMediaEngines();
@@ -6207,11 +6192,6 @@
return false;
}
-const String& HTMLMediaElement::mediaPlayerMediaCacheDirectory() const
-{
- return mediaCacheDirectory();
-}
-
bool HTMLMediaElement::mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge& challenge)
{
Frame* frame = document().frame();
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (199320 => 199321)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -380,11 +380,9 @@
void privateBrowsingStateDidChange() override;
// Media cache management.
- WEBCORE_EXPORT static void setMediaCacheDirectory(const String&);
- WEBCORE_EXPORT static const String& mediaCacheDirectory();
- WEBCORE_EXPORT static HashSet<RefPtr<SecurityOrigin>> originsInMediaCache(const String&);
- WEBCORE_EXPORT static void clearMediaCache(const String&, std::chrono::system_clock::time_point modifiedSince = { });
- WEBCORE_EXPORT static void clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>&);
+ WEBCORE_EXPORT static void getSitesInMediaCache(Vector<String>&);
+ WEBCORE_EXPORT static void clearMediaCache();
+ WEBCORE_EXPORT static void clearMediaCacheForSite(const String&);
static void resetMediaEngines();
bool isPlaying() const { return m_playing; }
@@ -599,7 +597,6 @@
CachedResourceLoader* mediaPlayerCachedResourceLoader() override;
RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() override;
bool mediaPlayerShouldUsePersistentCache() const override;
- const String& mediaPlayerMediaCacheDirectory() const override;
#if PLATFORM(WIN) && USE(AVFOUNDATION)
GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const override;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -170,13 +170,13 @@
CreateMediaEnginePlayer constructor;
MediaEngineSupportedTypes getSupportedTypes;
MediaEngineSupportsType supportsTypeAndCodecs;
- MediaEngineOriginsInMediaCache originsInMediaCache;
+ MediaEngineGetSitesInMediaCache getSitesInMediaCache;
MediaEngineClearMediaCache clearMediaCache;
- MediaEngineClearMediaCacheForOrigins clearMediaCacheForOrigins;
+ MediaEngineClearMediaCacheForSite clearMediaCacheForSite;
MediaEngineSupportsKeySystem supportsKeySystem;
};
-static void addMediaEngine(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType, MediaEngineOriginsInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForOrigins, MediaEngineSupportsKeySystem);
+static void addMediaEngine(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType, MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForSite, MediaEngineSupportsKeySystem);
static bool haveMediaEnginesVector;
@@ -234,13 +234,13 @@
}
static void addMediaEngine(CreateMediaEnginePlayer constructor, MediaEngineSupportedTypes getSupportedTypes, MediaEngineSupportsType supportsType,
- MediaEngineOriginsInMediaCache originsInMediaCache, MediaEngineClearMediaCache clearMediaCache, MediaEngineClearMediaCacheForOrigins clearMediaCacheForOrigins, MediaEngineSupportsKeySystem supportsKeySystem)
+ MediaEngineGetSitesInMediaCache getSitesInMediaCache, MediaEngineClearMediaCache clearMediaCache, MediaEngineClearMediaCacheForSite clearMediaCacheForSite, MediaEngineSupportsKeySystem supportsKeySystem)
{
ASSERT(constructor);
ASSERT(getSupportedTypes);
ASSERT(supportsType);
- mutableInstalledMediaEnginesVector().append(MediaPlayerFactory { constructor, getSupportedTypes, supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, supportsKeySystem });
+ mutableInstalledMediaEnginesVector().append(MediaPlayerFactory { constructor, getSupportedTypes, supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite, supportsKeySystem });
}
static const AtomicString& applicationOctetStream()
@@ -1042,39 +1042,30 @@
loadWithNextMediaEngine(m_currentMediaEngine);
}
-template<typename T>
-static void addToHash(HashSet<T>& toHash, HashSet<T>&& fromHash)
+void MediaPlayer::getSitesInMediaCache(Vector<String>& sites)
{
- if (toHash.isEmpty())
- toHash = WTFMove(fromHash);
- else
- toHash.add(fromHash.begin(), fromHash.end());
-}
-
-HashSet<RefPtr<SecurityOrigin>> MediaPlayer::originsInMediaCache(const String& path)
-{
- HashSet<RefPtr<SecurityOrigin>> origins;
for (auto& engine : installedMediaEngines()) {
- if (!engine.originsInMediaCache)
+ if (!engine.getSitesInMediaCache)
continue;
- addToHash(origins, engine.originsInMediaCache(path));
+ Vector<String> engineSites;
+ engine.getSitesInMediaCache(engineSites);
+ sites.appendVector(engineSites);
}
- return origins;
}
-void MediaPlayer::clearMediaCache(const String& path, std::chrono::system_clock::time_point modifiedSince)
+void MediaPlayer::clearMediaCache()
{
for (auto& engine : installedMediaEngines()) {
if (engine.clearMediaCache)
- engine.clearMediaCache(path, modifiedSince);
+ engine.clearMediaCache();
}
}
-void MediaPlayer::clearMediaCacheForOrigins(const String& path, const HashSet<RefPtr<SecurityOrigin>>& origins)
+void MediaPlayer::clearMediaCacheForSite(const String& site)
{
for (auto& engine : installedMediaEngines()) {
- if (engine.clearMediaCacheForOrigins)
- engine.clearMediaCacheForOrigins(path, origins);
+ if (engine.clearMediaCacheForSite)
+ engine.clearMediaCacheForSite(site);
}
}
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -40,7 +40,6 @@
#include "PlatformLayer.h"
#include "PlatformMediaResourceLoader.h"
#include "PlatformMediaSession.h"
-#include "SecurityOriginHash.h"
#include "Timer.h"
#include "VideoTrackPrivate.h"
#include <runtime/Uint8Array.h>
@@ -237,7 +236,6 @@
virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() { return nullptr; }
virtual bool doesHaveAttribute(const AtomicString&, AtomicString* = 0) const { return false; }
virtual bool mediaPlayerShouldUsePersistentCache() const { return true; }
- virtual const String& mediaPlayerMediaCacheDirectory() const { return emptyString(); }
#if ENABLE(VIDEO_TRACK)
virtual void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
@@ -294,9 +292,9 @@
static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&, const MediaPlayerSupportsTypeClient*);
static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
static bool isAvailable();
- static HashSet<RefPtr<SecurityOrigin>> originsInMediaCache(const String& path);
- static void clearMediaCache(const String& path, std::chrono::system_clock::time_point modifiedSince);
- static void clearMediaCacheForOrigins(const String& path, const HashSet<RefPtr<SecurityOrigin>>&);
+ static void getSitesInMediaCache(Vector<String>&);
+ static void clearMediaCache();
+ static void clearMediaCacheForSite(const String&);
static bool supportsKeySystem(const String& keySystem, const String& mimeType);
bool supportsFullscreen() const;
@@ -632,13 +630,13 @@
typedef std::function<std::unique_ptr<MediaPlayerPrivateInterface> (MediaPlayer*)> CreateMediaEnginePlayer;
typedef void (*MediaEngineSupportedTypes)(HashSet<String, ASCIICaseInsensitiveHash>& types);
typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const MediaEngineSupportParameters& parameters);
-typedef HashSet<RefPtr<SecurityOrigin>> (*MediaEngineOriginsInMediaCache)(const String& path);
-typedef void (*MediaEngineClearMediaCache)(const String& path, std::chrono::system_clock::time_point modifiedSince);
-typedef void (*MediaEngineClearMediaCacheForOrigins)(const String& path, const HashSet<RefPtr<SecurityOrigin>>&);
+typedef void (*MediaEngineGetSitesInMediaCache)(Vector<String>&);
+typedef void (*MediaEngineClearMediaCache)();
+typedef void (*MediaEngineClearMediaCacheForSite)(const String&);
typedef bool (*MediaEngineSupportsKeySystem)(const String& keySystem, const String& mimeType);
typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType,
- MediaEngineOriginsInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForOrigins, MediaEngineSupportsKeySystem);
+ MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForSite, MediaEngineSupportsKeySystem);
typedef void (*MediaEngineRegister)(MediaEngineRegistrar);
class MediaPlayerFactorySupport {
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -214,9 +214,9 @@
virtual unsigned audioDecodedByteCount() const { return 0; }
virtual unsigned videoDecodedByteCount() const { return 0; }
- HashSet<RefPtr<SecurityOrigin>> originsInMediaCache(const String&) { return { }; }
- void clearMediaCache(const String&, std::chrono::system_clock::time_point) { }
- void clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>&) { }
+ void getSitesInMediaCache(Vector<String>&) { }
+ void clearMediaCache() { }
+ void clearMediaCacheForSite(const String&) { }
virtual void setPrivateBrowsingMode(bool) { }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -87,10 +87,6 @@
static void registerMediaEngine(MediaEngineRegistrar);
- static HashSet<RefPtr<SecurityOrigin>> originsInMediaCache(const String&);
- static void clearMediaCache(const String&, std::chrono::system_clock::time_point modifiedSince);
- static void clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>&);
-
void setAsset(RetainPtr<id>);
void tracksChanged() override;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-04-11 23:46:07 UTC (rev 199321)
@@ -158,7 +158,6 @@
SOFT_LINK_CLASS(AVFoundation, AVURLAsset)
SOFT_LINK_CLASS(AVFoundation, AVAssetImageGenerator)
SOFT_LINK_CLASS(AVFoundation, AVMetadataItem)
-SOFT_LINK_CLASS(AVFoundation, AVAssetCache)
SOFT_LINK_CLASS(CoreImage, CIContext)
SOFT_LINK_CLASS(CoreImage, CIImage)
@@ -228,7 +227,6 @@
#endif
#if ENABLE(AVF_CAPTIONS)
-SOFT_LINK_POINTER(AVFoundation, AVURLAssetCacheKey, NSString*)
SOFT_LINK_POINTER(AVFoundation, AVURLAssetHTTPCookiesKey, NSString*)
SOFT_LINK_POINTER(AVFoundation, AVURLAssetOutOfBandAlternateTracksKey, NSString*)
SOFT_LINK_POINTER(AVFoundation, AVURLAssetUsesNoPersistentCacheKey, NSString*)
@@ -244,7 +242,6 @@
#define AVURLAssetHTTPCookiesKey getAVURLAssetHTTPCookiesKey()
#define AVURLAssetOutOfBandAlternateTracksKey getAVURLAssetOutOfBandAlternateTracksKey()
-#define AVURLAssetCacheKey getAVURLAssetCacheKey()
#define AVURLAssetUsesNoPersistentCacheKey getAVURLAssetUsesNoPersistentCacheKey()
#define AVOutOfBandAlternateTrackDisplayNameKey getAVOutOfBandAlternateTrackDisplayNameKey()
#define AVOutOfBandAlternateTrackExtendedLanguageTagKey getAVOutOfBandAlternateTrackExtendedLanguageTagKey()
@@ -425,97 +422,9 @@
{
if (isAvailable())
registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateAVFoundationObjC>(player); },
- getSupportedTypes, supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, supportsKeySystem);
+ getSupportedTypes, supportsType, 0, 0, 0, supportsKeySystem);
}
-static AVAssetCache *assetCacheForPath(const String& path)
-{
- NSURL *assetCacheURL;
-
- if (path.isEmpty())
- assetCacheURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()] URLByAppendingPathComponent:@"MediaCache" isDirectory:YES];
- else
- assetCacheURL = [NSURL fileURLWithPath:path isDirectory:YES];
-
- return [getAVAssetCacheClass() assetCacheWithURL:assetCacheURL];
-}
-
-HashSet<RefPtr<SecurityOrigin>> MediaPlayerPrivateAVFoundationObjC::originsInMediaCache(const String& path)
-{
- HashSet<RefPtr<SecurityOrigin>> origins;
- for (NSString *key in [assetCacheForPath(path) allKeys]) {
- URL keyAsURL = URL(URL(), key);
- if (keyAsURL.isValid())
- origins.add(SecurityOrigin::create(keyAsURL));
- }
- return origins;
-}
-
-static std::chrono::system_clock::time_point toSystemClockTime(NSDate *date)
-{
- ASSERT(date);
- using namespace std::chrono;
-
- return system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date.timeIntervalSince1970)));
-}
-
-void MediaPlayerPrivateAVFoundationObjC::clearMediaCache(const String& path, std::chrono::system_clock::time_point modifiedSince)
-{
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::clearMediaCache()");
-
- AVAssetCache* assetCache = assetCacheForPath(path);
-
- for (NSString *key in [assetCache allKeys]) {
- if (toSystemClockTime([assetCache lastModifiedDateOfEntryForKey:key]) > modifiedSince)
- [assetCache removeEntryForKey:key];
- }
-
- NSFileManager *fileManager = [NSFileManager defaultManager];
- NSURL *baseURL = [assetCache URL];
-
- if (modifiedSince <= std::chrono::system_clock::time_point { }) {
- [fileManager removeItemAtURL:baseURL error:nil];
- return;
- }
-
- NSArray *propertyKeys = @[NSURLNameKey, NSURLContentModificationDateKey, NSURLIsRegularFileKey];
- NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtURL:baseURL includingPropertiesForKeys:
- propertyKeys options:NSDirectoryEnumerationSkipsSubdirectoryDescendants
- errorHandler:nil];
-
- RetainPtr<NSMutableArray<NSURL *>> urlsToDelete = adoptNS([[NSMutableArray alloc] init]);
- for (NSURL *fileURL : enumerator) {
- NSDictionary<NSString *, id> *fileAttributes = [fileURL resourceValuesForKeys:propertyKeys error:nil];
-
- if (![fileAttributes[NSURLNameKey] hasPrefix:@"CachedMedia-"])
- continue;
-
- if (![fileAttributes[NSURLIsRegularFileKey] boolValue])
- continue;
-
- if (toSystemClockTime(fileAttributes[NSURLContentModificationDateKey]) <= modifiedSince)
- continue;
-
- [urlsToDelete addObject:fileURL];
- }
-
- for (NSURL *fileURL in urlsToDelete.get())
- [fileManager removeItemAtURL:fileURL error:nil];
-}
-
-void MediaPlayerPrivateAVFoundationObjC::clearMediaCacheForOrigins(const String& path, const HashSet<RefPtr<SecurityOrigin>>& origins)
-{
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::clearMediaCacheForOrigins()");
- AVAssetCache* assetCache = assetCacheForPath(path);
- for (NSString *key in [assetCache allKeys]) {
- URL keyAsURL = URL(URL(), key);
- if (keyAsURL.isValid()) {
- if (origins.contains(SecurityOrigin::create(keyAsURL)))
- [assetCache removeEntryForKey:key];
- }
- }
-}
-
MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC(MediaPlayer* player)
: MediaPlayerPrivateAVFoundation(player)
, m_weakPtrFactory(this)
@@ -965,11 +874,7 @@
}
#endif
- bool usePersistentCache = player()->client().mediaPlayerShouldUsePersistentCache();
- [options setObject:@(!usePersistentCache) forKey:AVURLAssetUsesNoPersistentCacheKey];
-
- if (usePersistentCache)
- [options setObject:assetCacheForPath(player()->client().mediaPlayerMediaCacheDirectory()) forKey:AVURLAssetCacheKey];
+ [options setObject:[NSNumber numberWithBool:!player()->client().mediaPlayerShouldUsePersistentCache()] forKey:AVURLAssetUsesNoPersistentCacheKey];
NSURL *cocoaURL = canonicalURL(url);
m_avAsset = adoptNS([allocAVURLAssetInstance() initWithURL:cocoaURL options:options.get()]);
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -68,9 +68,9 @@
static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
- static HashSet<RefPtr<SecurityOrigin>> originsInMediaCache(const String&);
- static void clearMediaCache(const String&, std::chrono::system_clock::time_point modifiedSince);
- static void clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>&);
+ static void getSitesInMediaCache(Vector<String>&);
+ static void clearMediaCache();
+ static void clearMediaCacheForSite(const String&);
static bool isAvailable();
PlatformMedia platformMedia() const override;
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (199320 => 199321)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-04-11 23:46:07 UTC (rev 199321)
@@ -175,7 +175,7 @@
{
if (isAvailable())
registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateQTKit>(player); }, getSupportedTypes,
- supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, 0);
+ supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite, 0);
}
MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit(MediaPlayer* player)
@@ -1339,30 +1339,23 @@
return QTKitLibrary();
}
-HashSet<RefPtr<SecurityOrigin>> MediaPlayerPrivateQTKit::originsInMediaCache(const String&)
+void MediaPlayerPrivateQTKit::getSitesInMediaCache(Vector<String>& sites)
{
- HashSet<RefPtr<SecurityOrigin>> origins;
NSArray *mediaSites = wkQTGetSitesInMediaDownloadCache();
-
- for (NSString *site in mediaSites) {
- URL siteAsURL = URL(URL(), site);
- if (siteAsURL.isValid())
- origins.add(SecurityOrigin::create(siteAsURL));
- }
- return origins;
+ for (NSString *site in mediaSites)
+ sites.append(site);
}
-void MediaPlayerPrivateQTKit::clearMediaCache(const String&, std::chrono::system_clock::time_point)
+void MediaPlayerPrivateQTKit::clearMediaCache()
{
LOG(Media, "MediaPlayerPrivateQTKit::clearMediaCache()");
wkQTClearMediaDownloadCache();
}
-void MediaPlayerPrivateQTKit::clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>& origins)
+void MediaPlayerPrivateQTKit::clearMediaCacheForSite(const String& site)
{
- LOG(Media, "MediaPlayerPrivateQTKit::clearMediaCacheForOrigins()");
- for (auto& origin : origins)
- wkQTClearMediaDownloadCacheForSite(origin->toRawString());
+ LOG(Media, "MediaPlayerPrivateQTKit::clearMediaCacheForSite()");
+ wkQTClearMediaDownloadCacheForSite(site);
}
void MediaPlayerPrivateQTKit::disableUnsupportedTracks()
Modified: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (199320 => 199321)
--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -55,21 +55,6 @@
#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
-#if USE(APPLE_INTERNAL_SDK)
-#import <AVFoundation/AVAssetCache_Private.h>
-#else
-NS_ASSUME_NONNULL_BEGIN
-@interface AVAssetCache : NSObject
-+ (AVAssetCache *)assetCacheWithURL:(NSURL *)URL;
-- (id)initWithURL:(NSURL *)URL;
-- (NSArray *)allKeys;
-- (NSDate *)lastModifiedDateOfEntryForKey:(NSString *)key;
-- (void)removeEntryForKey:(NSString *)key;
-@property (nonatomic, readonly, copy) NSURL *URL;
-@end
-NS_ASSUME_NONNULL_END
-#endif
-
#if PLATFORM(IOS)
#if HAVE(AVKIT) && USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebKit2/ChangeLog (199320 => 199321)
--- trunk/Source/WebKit2/ChangeLog 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-11 23:46:07 UTC (rev 199321)
@@ -1,3 +1,17 @@
+2016-04-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r199315.
+ https://bugs.webkit.org/show_bug.cgi?id=156482
+
+ This change broke the OS X Yosemite build. (Requested by jwtan
+ on #webkit).
+
+ Reverted changeset:
+
+ "When clearing cache, also clear AVFoundation cache."
+ https://bugs.webkit.org/show_bug.cgi?id=155783
+ http://trac.webkit.org/changeset/199315
+
2016-04-11 Jeremy Jones <[email protected]>
When clearing cache, also clear AVFoundation cache.
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (199320 => 199321)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -65,8 +65,6 @@
encoder << applicationCacheDirectoryExtensionHandle;
encoder << webSQLDatabaseDirectory;
encoder << webSQLDatabaseDirectoryExtensionHandle;
- encoder << mediaCacheDirectory;
- encoder << mediaCacheDirectoryExtensionHandle;
#if ENABLE(SECCOMP_FILTERS)
encoder << cookieStorageDirectory;
#endif
@@ -161,10 +159,6 @@
return false;
if (!decoder.decode(parameters.webSQLDatabaseDirectoryExtensionHandle))
return false;
- if (!decoder.decode(parameters.mediaCacheDirectory))
- return false;
- if (!decoder.decode(parameters.mediaCacheDirectoryExtensionHandle))
- return false;
#if ENABLE(SECCOMP_FILTERS)
if (!decoder.decode(parameters.cookieStorageDirectory))
return false;
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (199320 => 199321)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -72,8 +72,6 @@
SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
String webSQLDatabaseDirectory;
SandboxExtension::Handle webSQLDatabaseDirectoryExtensionHandle;
- String mediaCacheDirectory;
- SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
#if ENABLE(SECCOMP_FILTERS)
String cookieStorageDirectory;
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -46,7 +46,6 @@
configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
configuration->m_diskCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory();
- configuration->m_mediaCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaCacheDirectory();
configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
configuration->m_localStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory();
configuration->m_mediaKeysStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
@@ -58,7 +57,6 @@
ProcessPoolConfiguration::ProcessPoolConfiguration()
: m_applicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory())
, m_diskCacheDirectory(WebsiteDataStore::defaultNetworkCacheDirectory())
- , m_mediaCacheDirectory(WebsiteDataStore::defaultMediaCacheDirectory())
, m_indexedDBDatabaseDirectory(WebsiteDataStore::defaultIndexedDBDatabaseDirectory())
, m_localStorageDirectory(WebsiteDataStore::defaultLocalStorageDirectory())
, m_webSQLDatabaseDirectory(WebsiteDataStore::defaultWebSQLDatabaseDirectory())
@@ -81,7 +79,6 @@
copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
copy->m_diskCacheDirectory = this->m_diskCacheDirectory;
- copy->m_mediaCacheDirectory = this->m_mediaCacheDirectory;
copy->m_indexedDBDatabaseDirectory = this->m_indexedDBDatabaseDirectory;
copy->m_injectedBundlePath = this->m_injectedBundlePath;
copy->m_localStorageDirectory = this->m_localStorageDirectory;
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -65,9 +65,6 @@
const WTF::String& diskCacheDirectory() const { return m_diskCacheDirectory; }
void setDiskCacheDirectory(const WTF::String& diskCacheDirectory) { m_diskCacheDirectory = diskCacheDirectory; }
- const WTF::String& mediaCacheDirectory() const { return m_mediaCacheDirectory; }
- void setMediaCacheDirectory(const WTF::String& mediaCacheDirectory) { m_mediaCacheDirectory = mediaCacheDirectory; }
-
const WTF::String& indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
void setIndexedDBDatabaseDirectory(const WTF::String& indexedDBDatabaseDirectory) { m_indexedDBDatabaseDirectory = indexedDBDatabaseDirectory; }
@@ -105,7 +102,6 @@
WTF::String m_applicationCacheDirectory;
WTF::String m_diskCacheDirectory;
- WTF::String m_mediaCacheDirectory;
WTF::String m_indexedDBDatabaseDirectory;
WTF::String m_injectedBundlePath;
WTF::String m_localStorageDirectory;
Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -137,13 +137,5 @@
}
#endif
-
-#if !PLATFORM(COCOA)
-String WebsiteDataStore::defaultMediaCacheDirectory()
-{
- // FIXME: Implement. https://bugs.webkit.org/show_bug.cgi?id=156369 and https://bugs.webkit.org/show_bug.cgi?id=156370
- return String();
-}
-#endif
}
Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -49,7 +49,6 @@
static String defaultApplicationCacheDirectory();
static String defaultNetworkCacheDirectory();
- static String defaultMediaCacheDirectory();
static String defaultIndexedDBDatabaseDirectory();
static String defaultLocalStorageDirectory();
@@ -61,7 +60,6 @@
WebsiteDataStore(WebKit::WebsiteDataStore::Configuration);
WebsiteDataStore();
- static String tempDirectoryFileSystemRepresentation(const String& directoryName);
static String cacheDirectoryFileSystemRepresentation(const String& directoryName);
static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2016-04-11 23:46:07 UTC (rev 199321)
@@ -57,11 +57,6 @@
return cacheDirectoryFileSystemRepresentation("NetworkCache");
}
-String WebsiteDataStore::defaultMediaCacheDirectory()
-{
- return tempDirectoryFileSystemRepresentation("MediaCache");
-}
-
String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
{
return websiteDataDirectoryFileSystemRepresentation("IndexedDB");
@@ -87,33 +82,6 @@
return websiteDataDirectoryFileSystemRepresentation("ResourceLoadStatistics");
}
-String WebsiteDataStore::tempDirectoryFileSystemRepresentation(const String& directoryName)
-{
- static dispatch_once_t onceToken;
- static NSURL *tempURL;
-
- dispatch_once(&onceToken, ^{
- NSURL *url = "" fileURLWithPath:NSTemporaryDirectory()];
- if (!url)
- RELEASE_ASSERT_NOT_REACHED();
-
- if (!WebKit::processHasContainer()) {
- NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
- if (!bundleIdentifier)
- bundleIdentifier = [NSProcessInfo processInfo].processName;
- url = "" URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
- }
-
- tempURL = [[url URLByAppendingPathComponent:@"WebKit" isDirectory:YES] retain];
- });
-
- NSURL *url = "" URLByAppendingPathComponent:directoryName isDirectory:YES];
- if (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
- LOG_ERROR("Failed to create directory %@", url);
-
- return url.absoluteURL.path.fileSystemRepresentation;
-}
-
String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)
{
static dispatch_once_t onceToken;
@@ -176,7 +144,6 @@
configuration.applicationCacheDirectory = defaultApplicationCacheDirectory();
configuration.networkCacheDirectory = defaultNetworkCacheDirectory();
- configuration.mediaCacheDirectory = defaultMediaCacheDirectory();
configuration.webSQLDatabaseDirectory = defaultWebSQLDatabaseDirectory();
configuration.localStorageDirectory = defaultLocalStorageDirectory();
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-04-11 23:46:07 UTC (rev 199321)
@@ -64,7 +64,6 @@
NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
NSString *WebKitJSCFTLJITEnabledDefaultsKey = @"WebKitJSCFTLJITEnabledDefaultsKey";
NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @"WebKitMediaKeysStorageDirectory";
-NSString *WebKitMediaCacheDirectoryDefaultsKey = @"WebKitMediaCacheDirectory";
#if !PLATFORM(IOS)
static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
@@ -337,25 +336,6 @@
return stringByResolvingSymlinksInPath([localStorageDirectory stringByStandardizingPath]);
}
-String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
-{
- registerUserDefaultsIfNeeded();
-
- NSString *mediaKeysCacheDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaCacheDirectoryDefaultsKey];
- if (!mediaKeysCacheDirectory || ![mediaKeysCacheDirectory isKindOfClass:[NSString class]]) {
- mediaKeysCacheDirectory = NSTemporaryDirectory();
-
- if (!WebKit::processHasContainer()) {
- NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
- if (!bundleIdentifier)
- bundleIdentifier = [NSProcessInfo processInfo].processName;
- mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:bundleIdentifier];
- }
- mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:@"WebKit/MediaCache"];
- }
- return stringByResolvingSymlinksInPath([mediaKeysCacheDirectory stringByStandardizingPath]);
-}
-
String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
{
registerUserDefaultsIfNeeded();
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -128,7 +128,6 @@
configuration.localStorageDirectory = processPoolConfiguration.localStorageDirectory();
configuration.webSQLDatabaseDirectory = processPoolConfiguration.webSQLDatabaseDirectory();
configuration.applicationCacheDirectory = processPoolConfiguration.applicationCacheDirectory();
- configuration.mediaCacheDirectory = processPoolConfiguration.mediaCacheDirectory();
configuration.mediaKeysStorageDirectory = processPoolConfiguration.mediaKeysStorageDirectory();
configuration.networkCacheDirectory = processPoolConfiguration.diskCacheDirectory();
@@ -545,10 +544,6 @@
if (!parameters.webSQLDatabaseDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(parameters.webSQLDatabaseDirectory, parameters.webSQLDatabaseDirectoryExtensionHandle);
- parameters.mediaCacheDirectory = m_configuration->mediaCacheDirectory();
- if (!parameters.mediaCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.mediaCacheDirectory, parameters.mediaCacheDirectoryExtensionHandle);
-
#if ENABLE(SECCOMP_FILTERS)
parameters.cookieStorageDirectory = this->cookieStorageDirectory();
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -361,7 +361,6 @@
static String legacyPlatformDefaultIndexedDBDatabaseDirectory();
static String legacyPlatformDefaultWebSQLDatabaseDirectory();
static String legacyPlatformDefaultMediaKeysStorageDirectory();
- static String legacyPlatformDefaultMediaCacheDirectory();
static String legacyPlatformDefaultApplicationCacheDirectory();
static String legacyPlatformDefaultNetworkCacheDirectory();
static bool isNetworkCacheEnabled();
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -37,7 +37,6 @@
#include "WebsiteData.h"
#include <WebCore/ApplicationCacheStorage.h>
#include <WebCore/DatabaseTracker.h>
-#include <WebCore/HTMLMediaElement.h>
#include <WebCore/OriginLock.h>
#include <WebCore/SecurityOrigin.h>
#include <wtf/RunLoop.h>
@@ -78,7 +77,6 @@
, m_sessionID(WebCore::SessionID::defaultSessionID())
, m_networkCacheDirectory(WTFMove(configuration.networkCacheDirectory))
, m_applicationCacheDirectory(WTFMove(configuration.applicationCacheDirectory))
- , m_mediaCacheDirectory(WTFMove(configuration.mediaCacheDirectory))
, m_webSQLDatabaseDirectory(WTFMove(configuration.webSQLDatabaseDirectory))
, m_mediaKeysStorageDirectory(WTFMove(configuration.mediaKeysStorageDirectory))
, m_storageManager(StorageManager::create(WTFMove(configuration.localStorageDirectory)))
@@ -257,27 +255,6 @@
RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(fetchOptions, WTFMove(completionHandler)));
- if (dataTypes.contains(WebsiteDataType::DiskCache)) {
- StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
-
- callbackAggregator->addPendingCallback();
- m_queue->dispatch([fetchOptions, mediaCacheDirectory, callbackAggregator] {
- HashSet<RefPtr<WebCore::SecurityOrigin>> origins = WebCore::HTMLMediaElement::originsInMediaCache(mediaCacheDirectory.string());
- WebsiteData* websiteData = new WebsiteData;
-
- for (auto& origin : origins) {
- WebsiteData::Entry entry { origin, WebsiteDataType::DiskCache, 0 };
- websiteData->entries.append(WTFMove(entry));
- }
-
- WTF::RunLoop::main().dispatch([callbackAggregator, origins, websiteData] {
- callbackAggregator->removePendingCallback(WTFMove(*websiteData));
-
- delete websiteData;
- });
- });
- }
-
auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
if (networkProcessAccessType != ProcessAccessType::None) {
for (auto& processPool : processPools()) {
@@ -552,19 +529,6 @@
RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
- if (dataTypes.contains(WebsiteDataType::DiskCache)) {
- StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
-
- callbackAggregator->addPendingCallback();
- m_queue->dispatch([modifiedSince, mediaCacheDirectory, callbackAggregator] {
- WebCore::HTMLMediaElement::clearMediaCache(mediaCacheDirectory.string(), modifiedSince);
-
- WTF::RunLoop::main().dispatch([callbackAggregator] {
- callbackAggregator->removePendingCallback();
- });
- });
- }
-
auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
if (networkProcessAccessType != ProcessAccessType::None) {
for (auto& processPool : processPools()) {
@@ -791,25 +755,7 @@
};
RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
-
- if (dataTypes.contains(WebsiteDataType::DiskCache)) {
- StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
- HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& origin : dataRecord.origins)
- origins.add(origin);
- }
-
- callbackAggregator->addPendingCallback();
- m_queue->dispatch([origins, mediaCacheDirectory, callbackAggregator] {
- WebCore::HTMLMediaElement::clearMediaCacheForOrigins(mediaCacheDirectory.string(), origins);
-
- WTF::RunLoop::main().dispatch([callbackAggregator] {
- callbackAggregator->removePendingCallback();
- });
- });
- }
-
+
auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
if (networkProcessAccessType != ProcessAccessType::None) {
for (auto& processPool : processPools()) {
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-04-11 23:46:07 UTC (rev 199321)
@@ -61,7 +61,6 @@
String networkCacheDirectory;
String applicationCacheDirectory;
- String mediaCacheDirectory;
String webSQLDatabaseDirectory;
String localStorageDirectory;
String mediaKeysStorageDirectory;
@@ -118,7 +117,6 @@
const String m_networkCacheDirectory;
const String m_applicationCacheDirectory;
- const String m_mediaCacheDirectory;
const String m_webSQLDatabaseDirectory;
const String m_mediaKeysStorageDirectory;
Modified: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -87,11 +87,6 @@
return API::WebsiteDataStore::defaultApplicationCacheDirectory();
}
-String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
-{
- return API::WebsiteDataStore::defaultMediaCacheDirectory();
-}
-
void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
{
initializeInspectorServer();
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (199320 => 199321)
--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -86,11 +86,6 @@
return API::WebsiteDataStore::defaultApplicationCacheDirectory();
}
-WTF::String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
-{
- return API::WebsiteDataStore::defaultMediaCacheDirectory();
-}
-
void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
{
initInspectorServer();
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (199320 => 199321)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-04-11 23:46:07 UTC (rev 199321)
@@ -77,7 +77,6 @@
#include <WebCore/FrameLoader.h>
#include <WebCore/GCController.h>
#include <WebCore/GlyphPage.h>
-#include <WebCore/HTMLMediaElement.h>
#include <WebCore/IconDatabase.h>
#include <WebCore/JSDOMWindow.h>
#include <WebCore/Language.h>
@@ -294,9 +293,6 @@
if (!parameters.applicationCacheDirectory.isEmpty())
ApplicationCacheStorage::singleton().setCacheDirectory(parameters.applicationCacheDirectory);
- if (!parameters.mediaCacheDirectory.isEmpty())
- WebCore::HTMLMediaElement::setMediaCacheDirectory(parameters.mediaCacheDirectory);
-
setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
if (!parameters.languages.isEmpty())
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (199320 => 199321)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-04-11 23:22:16 UTC (rev 199320)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-04-11 23:46:07 UTC (rev 199321)
@@ -135,7 +135,6 @@
SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
- SandboxExtension::consumePermanently(parameters.mediaCacheDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
#if PLATFORM(IOS)
SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
