<!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>[185428] trunk/Source/WebKit2</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/185428">185428</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-10 13:47:15 -0700 (Wed, 10 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Do not indicate Media Keys are present when they are not
https://bugs.webkit.org/show_bug.cgi?id=145713
<rdar://problem/19752566>
Reviewed by Dean Jackson.
Correct the reporting of Media Key presence by checking for the actual
media key file, not just the directory. Sometimes the directory will exist
with no media key files (e.g., if a user navigates to the directory using
the Finder).
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::computeMediaKeyFile): Moved earlier in file so it could be used by
the 'mediaKeyOrigins' method.
(WebKit::WebsiteDataStore::mediaKeyOrigins): Only indicate we have a media key
origin if the folder actually contains the media key file.
(WebKit::WebsiteDataStore::removeMediaKeys): Use the existing 'computeMediaKeyFile',
rather than manually building the file from strings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185427 => 185428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-10 20:35:14 UTC (rev 185427)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-10 20:47:15 UTC (rev 185428)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-10 Brent Fulgham <bfulgham@apple.com>
+
+ [WK2] Do not indicate Media Keys are present when they are not
+ https://bugs.webkit.org/show_bug.cgi?id=145713
+ <rdar://problem/19752566>
+
+ Reviewed by Dean Jackson.
+
+ Correct the reporting of Media Key presence by checking for the actual
+ media key file, not just the directory. Sometimes the directory will exist
+ with no media key files (e.g., if a user navigates to the directory using
+ the Finder).
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::computeMediaKeyFile): Moved earlier in file so it could be used by
+ the 'mediaKeyOrigins' method.
+ (WebKit::WebsiteDataStore::mediaKeyOrigins): Only indicate we have a media key
+ origin if the folder actually contains the media key file.
+ (WebKit::WebsiteDataStore::removeMediaKeys): Use the existing 'computeMediaKeyFile',
+ rather than manually building the file from strings.
+
</ins><span class="cx"> 2015-06-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Support fetching website data
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (185427 => 185428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-10 20:35:14 UTC (rev 185427)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-10 20:47:15 UTC (rev 185428)
</span><span class="lines">@@ -894,6 +894,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static String computeMediaKeyFile(const String& mediaKeyDirectory)
+{
+ return WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
+}
+
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> WebsiteDataStore::mediaKeyOrigins(const String& mediaKeysStorageDirectory)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!mediaKeysStorageDirectory.isEmpty());
</span><span class="lines">@@ -901,6 +906,10 @@
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx">
</span><span class="cx"> for (const auto& originPath : WebCore::listDirectory(mediaKeysStorageDirectory, "*")) {
</span><ins>+ auto mediaKeyFile = computeMediaKeyFile(originPath);
+ if (!WebCore::fileExists(mediaKeyFile))
+ continue;
+
</ins><span class="cx"> auto mediaKeyIdentifier = WebCore::pathGetFileName(originPath);
</span><span class="cx">
</span><span class="cx"> if (auto securityOrigin = WebCore::SecurityOrigin::maybeCreateFromDatabaseIdentifier(mediaKeyIdentifier))
</span><span class="lines">@@ -910,11 +919,6 @@
</span><span class="cx"> return origins;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String computeMediaKeyFile(const String& mediaKeyDirectory)
-{
- return WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
-}
-
</del><span class="cx"> void WebsiteDataStore::removeMediaKeys(const String& mediaKeysStorageDirectory, std::chrono::system_clock::time_point modifiedSince)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!mediaKeysStorageDirectory.isEmpty());
</span><span class="lines">@@ -940,7 +944,7 @@
</span><span class="cx">
</span><span class="cx"> for (const auto& origin : origins) {
</span><span class="cx"> auto mediaKeyDirectory = WebCore::pathByAppendingComponent(mediaKeysStorageDirectory, origin->databaseIdentifier());
</span><del>- auto mediaKeyFile = WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
</del><ins>+ auto mediaKeyFile = computeMediaKeyFile(mediaKeyDirectory);
</ins><span class="cx">
</span><span class="cx"> WebCore::deleteFile(mediaKeyFile);
</span><span class="cx"> WebCore::deleteEmptyDirectory(mediaKeyDirectory);
</span></span></pre>
</div>
</div>
</body>
</html>