<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199321] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199321">199321</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-11 16:46:07 -0700 (Mon, 11 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/199315">r199315</a>.
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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacAVFoundationSPIh">trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm">trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebProcessPoolEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-11 Commit Queue <commit-queue@webkit.org>
+
+ 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
+
</ins><span class="cx"> 2016-04-11 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: get rid of InspectorBasicValue and InspectorString subclasses
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5593,38 +5593,23 @@
</span><span class="cx"> else
</span><span class="cx"> document().decrementLoadEventDelayCount();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx">
</span><del>-static String& sharedMediaCacheDirectory()
</del><ins>+void HTMLMediaElement::getSitesInMediaCache(Vector<String>& sites)
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<String> sharedMediaCacheDirectory;
- return sharedMediaCacheDirectory;
</del><ins>+ MediaPlayer::getSitesInMediaCache(sites);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::setMediaCacheDirectory(const String& path)
</del><ins>+void HTMLMediaElement::clearMediaCache()
</ins><span class="cx"> {
</span><del>- sharedMediaCacheDirectory() = path;
</del><ins>+ MediaPlayer::clearMediaCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const String& HTMLMediaElement::mediaCacheDirectory()
</del><ins>+void HTMLMediaElement::clearMediaCacheForSite(const String& site)
</ins><span class="cx"> {
</span><del>- return sharedMediaCacheDirectory();
</del><ins>+ MediaPlayer::clearMediaCacheForSite(site);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void HTMLMediaElement::resetMediaEngines()
</span><span class="cx"> {
</span><span class="cx"> MediaPlayer::resetMediaEngines();
</span><span class="lines">@@ -6207,11 +6192,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String& HTMLMediaElement::mediaPlayerMediaCacheDirectory() const
-{
- return mediaCacheDirectory();
-}
-
</del><span class="cx"> bool HTMLMediaElement::mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge& challenge)
</span><span class="cx"> {
</span><span class="cx"> Frame* frame = document().frame();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -380,11 +380,9 @@
</span><span class="cx"> void privateBrowsingStateDidChange() override;
</span><span class="cx">
</span><span class="cx"> // Media cache management.
</span><del>- 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>>&);
</del><ins>+ WEBCORE_EXPORT static void getSitesInMediaCache(Vector<String>&);
+ WEBCORE_EXPORT static void clearMediaCache();
+ WEBCORE_EXPORT static void clearMediaCacheForSite(const String&);
</ins><span class="cx"> static void resetMediaEngines();
</span><span class="cx">
</span><span class="cx"> bool isPlaying() const { return m_playing; }
</span><span class="lines">@@ -599,7 +597,6 @@
</span><span class="cx"> CachedResourceLoader* mediaPlayerCachedResourceLoader() override;
</span><span class="cx"> RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() override;
</span><span class="cx"> bool mediaPlayerShouldUsePersistentCache() const override;
</span><del>- const String& mediaPlayerMediaCacheDirectory() const override;
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && USE(AVFOUNDATION)
</span><span class="cx"> GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -170,13 +170,13 @@
</span><span class="cx"> CreateMediaEnginePlayer constructor;
</span><span class="cx"> MediaEngineSupportedTypes getSupportedTypes;
</span><span class="cx"> MediaEngineSupportsType supportsTypeAndCodecs;
</span><del>- MediaEngineOriginsInMediaCache originsInMediaCache;
</del><ins>+ MediaEngineGetSitesInMediaCache getSitesInMediaCache;
</ins><span class="cx"> MediaEngineClearMediaCache clearMediaCache;
</span><del>- MediaEngineClearMediaCacheForOrigins clearMediaCacheForOrigins;
</del><ins>+ MediaEngineClearMediaCacheForSite clearMediaCacheForSite;
</ins><span class="cx"> MediaEngineSupportsKeySystem supportsKeySystem;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void addMediaEngine(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType, MediaEngineOriginsInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForOrigins, MediaEngineSupportsKeySystem);
</del><ins>+static void addMediaEngine(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType, MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForSite, MediaEngineSupportsKeySystem);
</ins><span class="cx">
</span><span class="cx"> static bool haveMediaEnginesVector;
</span><span class="cx">
</span><span class="lines">@@ -234,13 +234,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void addMediaEngine(CreateMediaEnginePlayer constructor, MediaEngineSupportedTypes getSupportedTypes, MediaEngineSupportsType supportsType,
</span><del>- MediaEngineOriginsInMediaCache originsInMediaCache, MediaEngineClearMediaCache clearMediaCache, MediaEngineClearMediaCacheForOrigins clearMediaCacheForOrigins, MediaEngineSupportsKeySystem supportsKeySystem)
</del><ins>+ MediaEngineGetSitesInMediaCache getSitesInMediaCache, MediaEngineClearMediaCache clearMediaCache, MediaEngineClearMediaCacheForSite clearMediaCacheForSite, MediaEngineSupportsKeySystem supportsKeySystem)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(constructor);
</span><span class="cx"> ASSERT(getSupportedTypes);
</span><span class="cx"> ASSERT(supportsType);
</span><span class="cx">
</span><del>- mutableInstalledMediaEnginesVector().append(MediaPlayerFactory { constructor, getSupportedTypes, supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, supportsKeySystem });
</del><ins>+ mutableInstalledMediaEnginesVector().append(MediaPlayerFactory { constructor, getSupportedTypes, supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite, supportsKeySystem });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const AtomicString& applicationOctetStream()
</span><span class="lines">@@ -1042,39 +1042,30 @@
</span><span class="cx"> loadWithNextMediaEngine(m_currentMediaEngine);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T>
-static void addToHash(HashSet<T>& toHash, HashSet<T>&& fromHash)
</del><ins>+void MediaPlayer::getSitesInMediaCache(Vector<String>& sites)
</ins><span class="cx"> {
</span><del>- 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;
</del><span class="cx"> for (auto& engine : installedMediaEngines()) {
</span><del>- if (!engine.originsInMediaCache)
</del><ins>+ if (!engine.getSitesInMediaCache)
</ins><span class="cx"> continue;
</span><del>- addToHash(origins, engine.originsInMediaCache(path));
</del><ins>+ Vector<String> engineSites;
+ engine.getSitesInMediaCache(engineSites);
+ sites.appendVector(engineSites);
</ins><span class="cx"> }
</span><del>- return origins;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::clearMediaCache(const String& path, std::chrono::system_clock::time_point modifiedSince)
</del><ins>+void MediaPlayer::clearMediaCache()
</ins><span class="cx"> {
</span><span class="cx"> for (auto& engine : installedMediaEngines()) {
</span><span class="cx"> if (engine.clearMediaCache)
</span><del>- engine.clearMediaCache(path, modifiedSince);
</del><ins>+ engine.clearMediaCache();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::clearMediaCacheForOrigins(const String& path, const HashSet<RefPtr<SecurityOrigin>>& origins)
</del><ins>+void MediaPlayer::clearMediaCacheForSite(const String& site)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& engine : installedMediaEngines()) {
</span><del>- if (engine.clearMediaCacheForOrigins)
- engine.clearMediaCacheForOrigins(path, origins);
</del><ins>+ if (engine.clearMediaCacheForSite)
+ engine.clearMediaCacheForSite(site);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include "PlatformMediaResourceLoader.h"
</span><span class="cx"> #include "PlatformMediaSession.h"
</span><del>-#include "SecurityOriginHash.h"
</del><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "VideoTrackPrivate.h"
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="lines">@@ -237,7 +236,6 @@
</span><span class="cx"> virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() { return nullptr; }
</span><span class="cx"> virtual bool doesHaveAttribute(const AtomicString&, AtomicString* = 0) const { return false; }
</span><span class="cx"> virtual bool mediaPlayerShouldUsePersistentCache() const { return true; }
</span><del>- virtual const String& mediaPlayerMediaCacheDirectory() const { return emptyString(); }
</del><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual void mediaPlayerDidAddAudioTrack(PassRefPtr<AudioTrackPrivate>) { }
</span><span class="lines">@@ -294,9 +292,9 @@
</span><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&, const MediaPlayerSupportsTypeClient*);
</span><span class="cx"> static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
</span><span class="cx"> static bool isAvailable();
</span><del>- 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>>&);
</del><ins>+ static void getSitesInMediaCache(Vector<String>&);
+ static void clearMediaCache();
+ static void clearMediaCacheForSite(const String&);
</ins><span class="cx"> static bool supportsKeySystem(const String& keySystem, const String& mimeType);
</span><span class="cx">
</span><span class="cx"> bool supportsFullscreen() const;
</span><span class="lines">@@ -632,13 +630,13 @@
</span><span class="cx"> typedef std::function<std::unique_ptr<MediaPlayerPrivateInterface> (MediaPlayer*)> CreateMediaEnginePlayer;
</span><span class="cx"> typedef void (*MediaEngineSupportedTypes)(HashSet<String, ASCIICaseInsensitiveHash>& types);
</span><span class="cx"> typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const MediaEngineSupportParameters& parameters);
</span><del>-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>>&);
</del><ins>+typedef void (*MediaEngineGetSitesInMediaCache)(Vector<String>&);
+typedef void (*MediaEngineClearMediaCache)();
+typedef void (*MediaEngineClearMediaCacheForSite)(const String&);
</ins><span class="cx"> typedef bool (*MediaEngineSupportsKeySystem)(const String& keySystem, const String& mimeType);
</span><span class="cx">
</span><span class="cx"> typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType,
</span><del>- MediaEngineOriginsInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForOrigins, MediaEngineSupportsKeySystem);
</del><ins>+ MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForSite, MediaEngineSupportsKeySystem);
</ins><span class="cx"> typedef void (*MediaEngineRegister)(MediaEngineRegistrar);
</span><span class="cx">
</span><span class="cx"> class MediaPlayerFactorySupport {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -214,9 +214,9 @@
</span><span class="cx"> virtual unsigned audioDecodedByteCount() const { return 0; }
</span><span class="cx"> virtual unsigned videoDecodedByteCount() const { return 0; }
</span><span class="cx">
</span><del>- 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>>&) { }
</del><ins>+ void getSitesInMediaCache(Vector<String>&) { }
+ void clearMediaCache() { }
+ void clearMediaCacheForSite(const String&) { }
</ins><span class="cx">
</span><span class="cx"> virtual void setPrivateBrowsingMode(bool) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -87,10 +87,6 @@
</span><span class="cx">
</span><span class="cx"> static void registerMediaEngine(MediaEngineRegistrar);
</span><span class="cx">
</span><del>- 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>>&);
-
</del><span class="cx"> void setAsset(RetainPtr<id>);
</span><span class="cx"> void tracksChanged() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVURLAsset)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVAssetImageGenerator)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVMetadataItem)
</span><del>-SOFT_LINK_CLASS(AVFoundation, AVAssetCache)
</del><span class="cx">
</span><span class="cx"> SOFT_LINK_CLASS(CoreImage, CIContext)
</span><span class="cx"> SOFT_LINK_CLASS(CoreImage, CIImage)
</span><span class="lines">@@ -228,7 +227,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><del>-SOFT_LINK_POINTER(AVFoundation, AVURLAssetCacheKey, NSString*)
</del><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVURLAssetHTTPCookiesKey, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVURLAssetOutOfBandAlternateTracksKey, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVURLAssetUsesNoPersistentCacheKey, NSString*)
</span><span class="lines">@@ -244,7 +242,6 @@
</span><span class="cx">
</span><span class="cx"> #define AVURLAssetHTTPCookiesKey getAVURLAssetHTTPCookiesKey()
</span><span class="cx"> #define AVURLAssetOutOfBandAlternateTracksKey getAVURLAssetOutOfBandAlternateTracksKey()
</span><del>-#define AVURLAssetCacheKey getAVURLAssetCacheKey()
</del><span class="cx"> #define AVURLAssetUsesNoPersistentCacheKey getAVURLAssetUsesNoPersistentCacheKey()
</span><span class="cx"> #define AVOutOfBandAlternateTrackDisplayNameKey getAVOutOfBandAlternateTrackDisplayNameKey()
</span><span class="cx"> #define AVOutOfBandAlternateTrackExtendedLanguageTagKey getAVOutOfBandAlternateTrackExtendedLanguageTagKey()
</span><span class="lines">@@ -425,97 +422,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (isAvailable())
</span><span class="cx"> registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateAVFoundationObjC>(player); },
</span><del>- getSupportedTypes, supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, supportsKeySystem);
</del><ins>+ getSupportedTypes, supportsType, 0, 0, 0, supportsKeySystem);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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];
- }
- }
-}
-
</del><span class="cx"> MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC(MediaPlayer* player)
</span><span class="cx"> : MediaPlayerPrivateAVFoundation(player)
</span><span class="cx"> , m_weakPtrFactory(this)
</span><span class="lines">@@ -965,11 +874,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool usePersistentCache = player()->client().mediaPlayerShouldUsePersistentCache();
- [options setObject:@(!usePersistentCache) forKey:AVURLAssetUsesNoPersistentCacheKey];
-
- if (usePersistentCache)
- [options setObject:assetCacheForPath(player()->client().mediaPlayerMediaCacheDirectory()) forKey:AVURLAssetCacheKey];
</del><ins>+ [options setObject:[NSNumber numberWithBool:!player()->client().mediaPlayerShouldUsePersistentCache()] forKey:AVURLAssetUsesNoPersistentCacheKey];
</ins><span class="cx">
</span><span class="cx"> NSURL *cocoaURL = canonicalURL(url);
</span><span class="cx"> m_avAsset = adoptNS([allocAVURLAssetInstance() initWithURL:cocoaURL options:options.get()]);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -68,9 +68,9 @@
</span><span class="cx"> static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
</span><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="cx">
</span><del>- 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>>&);
</del><ins>+ static void getSitesInMediaCache(Vector<String>&);
+ static void clearMediaCache();
+ static void clearMediaCacheForSite(const String&);
</ins><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span><span class="cx"> PlatformMedia platformMedia() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isAvailable())
</span><span class="cx"> registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateQTKit>(player); }, getSupportedTypes,
</span><del>- supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, 0);
</del><ins>+ supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit(MediaPlayer* player)
</span><span class="lines">@@ -1339,30 +1339,23 @@
</span><span class="cx"> return QTKitLibrary();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashSet<RefPtr<SecurityOrigin>> MediaPlayerPrivateQTKit::originsInMediaCache(const String&)
</del><ins>+void MediaPlayerPrivateQTKit::getSitesInMediaCache(Vector<String>& sites)
</ins><span class="cx"> {
</span><del>- HashSet<RefPtr<SecurityOrigin>> origins;
</del><span class="cx"> NSArray *mediaSites = wkQTGetSitesInMediaDownloadCache();
</span><del>-
- for (NSString *site in mediaSites) {
- URL siteAsURL = URL(URL(), site);
- if (siteAsURL.isValid())
- origins.add(SecurityOrigin::create(siteAsURL));
- }
- return origins;
</del><ins>+ for (NSString *site in mediaSites)
+ sites.append(site);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateQTKit::clearMediaCache(const String&, std::chrono::system_clock::time_point)
</del><ins>+void MediaPlayerPrivateQTKit::clearMediaCache()
</ins><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateQTKit::clearMediaCache()");
</span><span class="cx"> wkQTClearMediaDownloadCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateQTKit::clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>& origins)
</del><ins>+void MediaPlayerPrivateQTKit::clearMediaCacheForSite(const String& site)
</ins><span class="cx"> {
</span><del>- LOG(Media, "MediaPlayerPrivateQTKit::clearMediaCacheForOrigins()");
- for (auto& origin : origins)
- wkQTClearMediaDownloadCacheForSite(origin->toRawString());
</del><ins>+ LOG(Media, "MediaPlayerPrivateQTKit::clearMediaCacheForSite()");
+ wkQTClearMediaDownloadCacheForSite(site);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateQTKit::disableUnsupportedTracks()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacAVFoundationSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -55,21 +55,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVKIT) && USE(APPLE_INTERNAL_SDK)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-11 Commit Queue <commit-queue@webkit.org>
+
+ 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
+
</ins><span class="cx"> 2016-04-11 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> When clearing cache, also clear AVFoundation cache.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx"> encoder << applicationCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << webSQLDatabaseDirectory;
</span><span class="cx"> encoder << webSQLDatabaseDirectoryExtensionHandle;
</span><del>- encoder << mediaCacheDirectory;
- encoder << mediaCacheDirectoryExtensionHandle;
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><span class="cx"> #endif
</span><span class="lines">@@ -161,10 +159,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.webSQLDatabaseDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.mediaCacheDirectory))
- return false;
- if (!decoder.decode(parameters.mediaCacheDirectoryExtensionHandle))
- return false;
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> if (!decoder.decode(parameters.cookieStorageDirectory))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
</span><span class="cx"> String webSQLDatabaseDirectory;
</span><span class="cx"> SandboxExtension::Handle webSQLDatabaseDirectoryExtensionHandle;
</span><del>- String mediaCacheDirectory;
- SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> String cookieStorageDirectory;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx">
</span><span class="cx"> configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
</span><span class="cx"> configuration->m_diskCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory();
</span><del>- configuration->m_mediaCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaCacheDirectory();
</del><span class="cx"> configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
</span><span class="cx"> configuration->m_localStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory();
</span><span class="cx"> configuration->m_mediaKeysStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> ProcessPoolConfiguration::ProcessPoolConfiguration()
</span><span class="cx"> : m_applicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory())
</span><span class="cx"> , m_diskCacheDirectory(WebsiteDataStore::defaultNetworkCacheDirectory())
</span><del>- , m_mediaCacheDirectory(WebsiteDataStore::defaultMediaCacheDirectory())
</del><span class="cx"> , m_indexedDBDatabaseDirectory(WebsiteDataStore::defaultIndexedDBDatabaseDirectory())
</span><span class="cx"> , m_localStorageDirectory(WebsiteDataStore::defaultLocalStorageDirectory())
</span><span class="cx"> , m_webSQLDatabaseDirectory(WebsiteDataStore::defaultWebSQLDatabaseDirectory())
</span><span class="lines">@@ -81,7 +79,6 @@
</span><span class="cx"> copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
</span><span class="cx"> copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
</span><span class="cx"> copy->m_diskCacheDirectory = this->m_diskCacheDirectory;
</span><del>- copy->m_mediaCacheDirectory = this->m_mediaCacheDirectory;
</del><span class="cx"> copy->m_indexedDBDatabaseDirectory = this->m_indexedDBDatabaseDirectory;
</span><span class="cx"> copy->m_injectedBundlePath = this->m_injectedBundlePath;
</span><span class="cx"> copy->m_localStorageDirectory = this->m_localStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,9 +65,6 @@
</span><span class="cx"> const WTF::String& diskCacheDirectory() const { return m_diskCacheDirectory; }
</span><span class="cx"> void setDiskCacheDirectory(const WTF::String& diskCacheDirectory) { m_diskCacheDirectory = diskCacheDirectory; }
</span><span class="cx">
</span><del>- const WTF::String& mediaCacheDirectory() const { return m_mediaCacheDirectory; }
- void setMediaCacheDirectory(const WTF::String& mediaCacheDirectory) { m_mediaCacheDirectory = mediaCacheDirectory; }
-
</del><span class="cx"> const WTF::String& indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
</span><span class="cx"> void setIndexedDBDatabaseDirectory(const WTF::String& indexedDBDatabaseDirectory) { m_indexedDBDatabaseDirectory = indexedDBDatabaseDirectory; }
</span><span class="cx">
</span><span class="lines">@@ -105,7 +102,6 @@
</span><span class="cx">
</span><span class="cx"> WTF::String m_applicationCacheDirectory;
</span><span class="cx"> WTF::String m_diskCacheDirectory;
</span><del>- WTF::String m_mediaCacheDirectory;
</del><span class="cx"> WTF::String m_indexedDBDatabaseDirectory;
</span><span class="cx"> WTF::String m_injectedBundlePath;
</span><span class="cx"> WTF::String m_localStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -137,13 +137,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#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
</del><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx">
</span><span class="cx"> static String defaultApplicationCacheDirectory();
</span><span class="cx"> static String defaultNetworkCacheDirectory();
</span><del>- static String defaultMediaCacheDirectory();
</del><span class="cx">
</span><span class="cx"> static String defaultIndexedDBDatabaseDirectory();
</span><span class="cx"> static String defaultLocalStorageDirectory();
</span><span class="lines">@@ -61,7 +60,6 @@
</span><span class="cx"> WebsiteDataStore(WebKit::WebsiteDataStore::Configuration);
</span><span class="cx"> WebsiteDataStore();
</span><span class="cx">
</span><del>- static String tempDirectoryFileSystemRepresentation(const String& directoryName);
</del><span class="cx"> static String cacheDirectoryFileSystemRepresentation(const String& directoryName);
</span><span class="cx"> static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -57,11 +57,6 @@
</span><span class="cx"> return cacheDirectoryFileSystemRepresentation("NetworkCache");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebsiteDataStore::defaultMediaCacheDirectory()
-{
- return tempDirectoryFileSystemRepresentation("MediaCache");
-}
-
</del><span class="cx"> String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
</span><span class="cx"> {
</span><span class="cx"> return websiteDataDirectoryFileSystemRepresentation("IndexedDB");
</span><span class="lines">@@ -87,33 +82,6 @@
</span><span class="cx"> return websiteDataDirectoryFileSystemRepresentation("ResourceLoadStatistics");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebsiteDataStore::tempDirectoryFileSystemRepresentation(const String& directoryName)
-{
- static dispatch_once_t onceToken;
- static NSURL *tempURL;
-
- dispatch_once(&onceToken, ^{
- NSURL *url = [NSURL fileURLWithPath:NSTemporaryDirectory()];
- if (!url)
- RELEASE_ASSERT_NOT_REACHED();
-
- if (!WebKit::processHasContainer()) {
- NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
- if (!bundleIdentifier)
- bundleIdentifier = [NSProcessInfo processInfo].processName;
- url = [url URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
- }
-
- tempURL = [[url URLByAppendingPathComponent:@"WebKit" isDirectory:YES] retain];
- });
-
- NSURL *url = [tempURL 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;
-}
-
</del><span class="cx"> String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)
</span><span class="cx"> {
</span><span class="cx"> static dispatch_once_t onceToken;
</span><span class="lines">@@ -176,7 +144,6 @@
</span><span class="cx">
</span><span class="cx"> configuration.applicationCacheDirectory = defaultApplicationCacheDirectory();
</span><span class="cx"> configuration.networkCacheDirectory = defaultNetworkCacheDirectory();
</span><del>- configuration.mediaCacheDirectory = defaultMediaCacheDirectory();
</del><span class="cx">
</span><span class="cx"> configuration.webSQLDatabaseDirectory = defaultWebSQLDatabaseDirectory();
</span><span class="cx"> configuration.localStorageDirectory = defaultLocalStorageDirectory();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
</span><span class="cx"> NSString *WebKitJSCFTLJITEnabledDefaultsKey = @"WebKitJSCFTLJITEnabledDefaultsKey";
</span><span class="cx"> NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @"WebKitMediaKeysStorageDirectory";
</span><del>-NSString *WebKitMediaCacheDirectoryDefaultsKey = @"WebKitMediaCacheDirectory";
</del><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
</span><span class="lines">@@ -337,25 +336,6 @@
</span><span class="cx"> return stringByResolvingSymlinksInPath([localStorageDirectory stringByStandardizingPath]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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]);
-}
-
</del><span class="cx"> String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
</span><span class="cx"> {
</span><span class="cx"> registerUserDefaultsIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> configuration.localStorageDirectory = processPoolConfiguration.localStorageDirectory();
</span><span class="cx"> configuration.webSQLDatabaseDirectory = processPoolConfiguration.webSQLDatabaseDirectory();
</span><span class="cx"> configuration.applicationCacheDirectory = processPoolConfiguration.applicationCacheDirectory();
</span><del>- configuration.mediaCacheDirectory = processPoolConfiguration.mediaCacheDirectory();
</del><span class="cx"> configuration.mediaKeysStorageDirectory = processPoolConfiguration.mediaKeysStorageDirectory();
</span><span class="cx"> configuration.networkCacheDirectory = processPoolConfiguration.diskCacheDirectory();
</span><span class="cx">
</span><span class="lines">@@ -545,10 +544,6 @@
</span><span class="cx"> if (!parameters.webSQLDatabaseDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.webSQLDatabaseDirectory, parameters.webSQLDatabaseDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- parameters.mediaCacheDirectory = m_configuration->mediaCacheDirectory();
- if (!parameters.mediaCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.mediaCacheDirectory, parameters.mediaCacheDirectoryExtensionHandle);
-
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> parameters.cookieStorageDirectory = this->cookieStorageDirectory();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -361,7 +361,6 @@
</span><span class="cx"> static String legacyPlatformDefaultIndexedDBDatabaseDirectory();
</span><span class="cx"> static String legacyPlatformDefaultWebSQLDatabaseDirectory();
</span><span class="cx"> static String legacyPlatformDefaultMediaKeysStorageDirectory();
</span><del>- static String legacyPlatformDefaultMediaCacheDirectory();
</del><span class="cx"> static String legacyPlatformDefaultApplicationCacheDirectory();
</span><span class="cx"> static String legacyPlatformDefaultNetworkCacheDirectory();
</span><span class="cx"> static bool isNetworkCacheEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "WebsiteData.h"
</span><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/DatabaseTracker.h>
</span><del>-#include <WebCore/HTMLMediaElement.h>
</del><span class="cx"> #include <WebCore/OriginLock.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -78,7 +77,6 @@
</span><span class="cx"> , m_sessionID(WebCore::SessionID::defaultSessionID())
</span><span class="cx"> , m_networkCacheDirectory(WTFMove(configuration.networkCacheDirectory))
</span><span class="cx"> , m_applicationCacheDirectory(WTFMove(configuration.applicationCacheDirectory))
</span><del>- , m_mediaCacheDirectory(WTFMove(configuration.mediaCacheDirectory))
</del><span class="cx"> , m_webSQLDatabaseDirectory(WTFMove(configuration.webSQLDatabaseDirectory))
</span><span class="cx"> , m_mediaKeysStorageDirectory(WTFMove(configuration.mediaKeysStorageDirectory))
</span><span class="cx"> , m_storageManager(StorageManager::create(WTFMove(configuration.localStorageDirectory)))
</span><span class="lines">@@ -257,27 +255,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(fetchOptions, WTFMove(completionHandler)));
</span><span class="cx">
</span><del>- 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;
- });
- });
- }
-
</del><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="cx"> for (auto& processPool : processPools()) {
</span><span class="lines">@@ -552,19 +529,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
</span><span class="cx">
</span><del>- 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();
- });
- });
- }
-
</del><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="cx"> for (auto& processPool : processPools()) {
</span><span class="lines">@@ -791,25 +755,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
</span><del>-
- 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();
- });
- });
- }
-
</del><ins>+
</ins><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="cx"> for (auto& processPool : processPools()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> String networkCacheDirectory;
</span><span class="cx"> String applicationCacheDirectory;
</span><span class="cx">
</span><del>- String mediaCacheDirectory;
</del><span class="cx"> String webSQLDatabaseDirectory;
</span><span class="cx"> String localStorageDirectory;
</span><span class="cx"> String mediaKeysStorageDirectory;
</span><span class="lines">@@ -118,7 +117,6 @@
</span><span class="cx">
</span><span class="cx"> const String m_networkCacheDirectory;
</span><span class="cx"> const String m_applicationCacheDirectory;
</span><del>- const String m_mediaCacheDirectory;
</del><span class="cx">
</span><span class="cx"> const String m_webSQLDatabaseDirectory;
</span><span class="cx"> const String m_mediaKeysStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebProcessPoolEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -87,11 +87,6 @@
</span><span class="cx"> return API::WebsiteDataStore::defaultApplicationCacheDirectory();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
-{
- return API::WebsiteDataStore::defaultMediaCacheDirectory();
-}
-
</del><span class="cx"> void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> initializeInspectorServer();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -86,11 +86,6 @@
</span><span class="cx"> return API::WebsiteDataStore::defaultApplicationCacheDirectory();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WTF::String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
-{
- return API::WebsiteDataStore::defaultMediaCacheDirectory();
-}
-
</del><span class="cx"> void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> initInspectorServer();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="cx"> #include <WebCore/GCController.h>
</span><span class="cx"> #include <WebCore/GlyphPage.h>
</span><del>-#include <WebCore/HTMLMediaElement.h>
</del><span class="cx"> #include <WebCore/IconDatabase.h>
</span><span class="cx"> #include <WebCore/JSDOMWindow.h>
</span><span class="cx"> #include <WebCore/Language.h>
</span><span class="lines">@@ -294,9 +293,6 @@
</span><span class="cx"> if (!parameters.applicationCacheDirectory.isEmpty())
</span><span class="cx"> ApplicationCacheStorage::singleton().setCacheDirectory(parameters.applicationCacheDirectory);
</span><span class="cx">
</span><del>- if (!parameters.mediaCacheDirectory.isEmpty())
- WebCore::HTMLMediaElement::setMediaCacheDirectory(parameters.mediaCacheDirectory);
-
</del><span class="cx"> setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
</span><span class="cx">
</span><span class="cx"> if (!parameters.languages.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (199320 => 199321)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -135,7 +135,6 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.mediaCacheDirectoryExtensionHandle);
</del><span class="cx"> SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span></span></pre>
</div>
</div>
</body>
</html>