<!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>[181188] branches/safari-600.1.4.15-branch</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/181188">181188</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 15:13:53 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/180337">r180337</a>. rdar://problem/20074071</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehistoryPageCachecpp">branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoretestingInternalscpp">branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoretestingInternalsh">branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoretestingInternalsidl">branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsfasthistorypagecacheclearingexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfasthistorypagecacheclearinghtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (181187 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-03-06 23:08:10 UTC (rev 181187)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-03-06 Lucas Forschler <lforschler@apple.com>
+
+ Merge r180337
+
+ 2015-02-18 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r179347): Clearing the PageCache no longer clears the PageCache.
+ <https://webkit.org/b/141788>
+
+ Reviewed by Anders Carlsson.
+
+ Add a simple test that navigates to a temporary page which immediately does a history.back
+ navigation. Upon returning to the first page, check that the page cache now has 1 entry,
+ and that clearing the page cache makes that entry go away.
+
+ * fast/history/page-cache-clearing-expected.txt: Added.
+ * fast/history/page-cache-clearing.html: Added.
+
</ins><span class="cx"> 2015-02-26 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r173806.
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfasthistorypagecacheclearingexpectedtxtfromrev180337trunkLayoutTestsfasthistorypagecacheclearingexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing-expected.txt (from rev 180337, trunk/LayoutTests/fast/history/page-cache-clearing-expected.txt) (0 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing-expected.txt 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Tests that clearing the page cache doesn't leave pages in the cache.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+pageshow - not from cache
+pagehide - entering cache
+pageshow - from cache
+Cached page count before clearing: 1
+Clearing the page cache
+Cached page count after clearing: 0
+PASS
+
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfasthistorypagecacheclearinghtmlfromrev180337trunkLayoutTestsfasthistorypagecacheclearinghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing.html (from rev 180337, trunk/LayoutTests/fast/history/page-cache-clearing.html) (0 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/history/page-cache-clearing.html 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("Tests that clearing the page cache doesn't leave pages in the cache.");
+
+if (!window.internals)
+ debug("This test requires window.internals");
+
+window.addEventListener("pageshow", function(event) {
+ debug("pageshow - " + (event.persisted ? "" : "not ") + "from cache");
+ if (event.persisted) {
+ var cachedPageCountBefore = window.internals.pageCacheSize();
+ debug("Cached page count before clearing: " + cachedPageCountBefore);
+ debug("Clearing the page cache");
+ window.internals.clearPageCache();
+ var cachedPageCountAfter = window.internals.pageCacheSize();
+ debug("Cached page count after clearing: " + cachedPageCountAfter);
+ if (cachedPageCountBefore != 0 && cachedPageCountAfter == 0)
+ debug("PASS");
+ else
+ debug("FAIL");
+ finishJSTest();
+ window.testRunner.notifyDone();
+ }
+}, false);
+
+window.addEventListener("pagehide", function(event) {
+ debug("pagehide - " + (event.persisted ? "" : "not ") + "entering cache");
+ if (!event.persisted) {
+ debug("FAIL - Page did not enter the page cache.");
+ finishJSTest();
+ window.testRunner.notifyDone();
+ }
+}, false);
+
+window.addEventListener('load', function() {
+
+ // Enable the PageCache and make this an async test.
+ if (window.testRunner) {
+ window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ window.testRunner.waitUntilDone();
+ }
+
+ // Force a back navigation back to this page.
+ setTimeout(function() {
+ window.location.href = "resources/page-cache-helper.html";
+ }, 0);
+
+}, false);
+
+var successfullyParsed = true;
+var jsTestIsAsync = true;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (181187 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-06 23:08:10 UTC (rev 181187)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-03-06 Lucas Forschler <lforschler@apple.com>
+
+ Merge r180337
+
+ 2015-02-18 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r179347): Clearing the PageCache no longer clears the PageCache.
+ <https://webkit.org/b/141788>
+
+ Reviewed by Anders Carlsson.
+
+ Once again we've fallen into the TemporaryChange trap:
+
+ TemporaryChange<unsigned>(m_member, temporaryValue);
+
+ The code above doesn't actually do anything. Since the TemporaryChange local is not named,
+ it immediately goes out of scope and restores the original value of m_member.
+
+ Unless someone knows a C++ trick to prevent these, we'll need to add a style checker pass
+ to catch bugs like this. Whatever we do will be done separately from this bug.
+
+ Test: fast/history/page-cache-clearing.html
+
+ * history/PageCache.cpp:
+ (WebCore::PageCache::pruneToSizeNow): Name the local so it lives longer.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::clearPageCache):
+ (WebCore::Internals::pageCacheSize):
+ * testing/Internals.h:
+ * testing/Internals.idl: Add a way to clear the page cache and query its size from
+ window.internals to facilitate writing a simple test for this bug.
+
</ins><span class="cx"> 2015-03-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r180906. <rdar://problem/20058845>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp (181187 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp 2015-03-06 23:08:10 UTC (rev 181187)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx">
</span><span class="cx"> void PageCache::pruneToCapacityNow(int capacity, PruningReason pruningReason)
</span><span class="cx"> {
</span><del>- TemporaryChange<int>(m_capacity, std::max(capacity, 0));
</del><ins>+ TemporaryChange<int> change(m_capacity, std::max(capacity, 0));
</ins><span class="cx"> prune(pruningReason);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp (181187 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp 2015-03-06 23:08:10 UTC (rev 181187)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "MemoryInfo.h"
</span><span class="cx"> #include "Page.h"
</span><ins>+#include "PageCache.h"
</ins><span class="cx"> #include "PrintContext.h"
</span><span class="cx"> #include "PseudoElement.h"
</span><span class="cx"> #include "Range.h"
</span><span class="lines">@@ -368,6 +369,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+void Internals::clearPageCache()
+{
+ pageCache()->pruneToCapacityNow(0, PruningReason::None);
+}
+
+unsigned Internals::pageCacheSize() const
+{
+ return pageCache()->pageCount();
+}
+
</ins><span class="cx"> Node* Internals::treeScopeRootNode(Node* node, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!node) {
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h (181187 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h 2015-03-06 23:08:10 UTC (rev 181187)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -80,6 +80,9 @@
</span><span class="cx"> bool isPreloaded(const String& url);
</span><span class="cx"> bool isLoadingFromMemoryCache(const String& url);
</span><span class="cx">
</span><ins>+ void clearPageCache();
+ unsigned pageCacheSize() const;
+
</ins><span class="cx"> PassRefPtr<CSSComputedStyleDeclaration> computedStyleIncludingVisitedInfo(Node*, ExceptionCode&) const;
</span><span class="cx">
</span><span class="cx"> Node* ensureShadowRoot(Element* host, ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl (181187 => 181188)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl 2015-03-06 23:08:10 UTC (rev 181187)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl 2015-03-06 23:13:53 UTC (rev 181188)
</span><span class="lines">@@ -36,6 +36,9 @@
</span><span class="cx"> boolean isPreloaded(DOMString url);
</span><span class="cx"> boolean isLoadingFromMemoryCache(DOMString url);
</span><span class="cx">
</span><ins>+ void clearPageCache();
+ unsigned int pageCacheSize();
+
</ins><span class="cx"> [RaisesException] CSSStyleDeclaration computedStyleIncludingVisitedInfo(Node node);
</span><span class="cx">
</span><span class="cx"> [RaisesException] Node ensureShadowRoot(Element host);
</span></span></pre>
</div>
</div>
</body>
</html>