<!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>[177647] trunk/Source/WebCore</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/177647">177647</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-22 12:13:07 -0800 (Mon, 22 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Log using FeatureCounter when a PacheCache entry is not reused because it expired
https://bugs.webkit.org/show_bug.cgi?id=139869
<rdar://problem/19255690>
Reviewed by Darin Adler.
Log using FeatureCounter when a PacheCache entry is not reused because
it expired.
* history/PageCache.cpp:
(WebCore::PageCache::take):
(WebCore::PageCache::get):
* history/PageCache.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::loadDifferentDocumentItem):
* loader/HistoryController.cpp:
(WebCore::HistoryController::invalidateCurrentItemCachedPage):
* platform/FeatureCounterKeys.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCacheh">trunk/Source/WebCore/history/PageCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFeatureCounterKeysh">trunk/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177646 => 177647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-22 20:13:02 UTC (rev 177646)
+++ trunk/Source/WebCore/ChangeLog 2014-12-22 20:13:07 UTC (rev 177647)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-12-22 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log using FeatureCounter when a PacheCache entry is not reused because it expired
+ https://bugs.webkit.org/show_bug.cgi?id=139869
+ <rdar://problem/19255690>
+
+ Reviewed by Darin Adler.
+
+ Log using FeatureCounter when a PacheCache entry is not reused because
+ it expired.
+
+ * history/PageCache.cpp:
+ (WebCore::PageCache::take):
+ (WebCore::PageCache::get):
+ * history/PageCache.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ (WebCore::FrameLoader::loadDifferentDocumentItem):
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::invalidateCurrentItemCachedPage):
+ * platform/FeatureCounterKeys.h:
+
</ins><span class="cx"> 2014-12-22 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the windows build.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (177646 => 177647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2014-12-22 20:13:02 UTC (rev 177646)
+++ trunk/Source/WebCore/history/PageCache.cpp 2014-12-22 20:13:07 UTC (rev 177647)
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> prune();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<CachedPage> PageCache::take(HistoryItem* item)
</del><ins>+std::unique_ptr<CachedPage> PageCache::take(HistoryItem* item, Page* page)
</ins><span class="cx"> {
</span><span class="cx"> if (!item)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -468,25 +468,27 @@
</span><span class="cx">
</span><span class="cx"> if (cachedPage->hasExpired()) {
</span><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item->url().string().ascii().data());
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureExpiredKey);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return cachedPage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedPage* PageCache::get(HistoryItem* item)
</del><ins>+CachedPage* PageCache::get(HistoryItem* item, Page* page)
</ins><span class="cx"> {
</span><span class="cx"> if (!item)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (CachedPage* cachedPage = item->m_cachedPage.get()) {
</span><span class="cx"> if (!cachedPage->hasExpired())
</span><span class="cx"> return cachedPage;
</span><span class="cx">
</span><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item->url().string().ascii().data());
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureExpiredKey);
</ins><span class="cx"> pageCache()->remove(item);
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageCache::remove(HistoryItem* item)
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.h (177646 => 177647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.h 2014-12-22 20:13:02 UTC (rev 177646)
+++ trunk/Source/WebCore/history/PageCache.h 2014-12-22 20:13:07 UTC (rev 177647)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx">
</span><span class="cx"> void add(PassRefPtr<HistoryItem>, Page&); // Prunes if capacity() is exceeded.
</span><span class="cx"> WEBCORE_EXPORT void remove(HistoryItem*);
</span><del>- CachedPage* get(HistoryItem* item);
- std::unique_ptr<CachedPage> take(HistoryItem*);
</del><ins>+ CachedPage* get(HistoryItem*, Page*);
+ std::unique_ptr<CachedPage> take(HistoryItem*, Page*);
</ins><span class="cx">
</span><span class="cx"> int pageCount() const { return m_size; }
</span><span class="cx"> WEBCORE_EXPORT int frameCount() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (177646 => 177647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-22 20:13:02 UTC (rev 177646)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-22 20:13:07 UTC (rev 177647)
</span><span class="lines">@@ -1749,7 +1749,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CachedPage> cachedPage;
</span><span class="cx"> if (m_loadingFromCachedPage)
</span><del>- cachedPage = pageCache()->take(history().provisionalItem());
</del><ins>+ cachedPage = pageCache()->take(history().provisionalItem(), m_frame.page());
</ins><span class="cx">
</span><span class="cx"> LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame.tree().uniqueName().string().utf8().data(),
</span><span class="cx"> m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "",
</span><span class="lines">@@ -3175,7 +3175,7 @@
</span><span class="cx"> // Remember this item so we can traverse any child items as child frames load
</span><span class="cx"> history().setProvisionalItem(item);
</span><span class="cx">
</span><del>- if (CachedPage* cachedPage = pageCache()->get(item)) {
</del><ins>+ if (CachedPage* cachedPage = pageCache()->get(item, m_frame.page())) {
</ins><span class="cx"> auto documentLoader = cachedPage->documentLoader();
</span><span class="cx"> documentLoader->setTriggeringAction(NavigationAction(documentLoader->request(), loadType, false));
</span><span class="cx"> documentLoader->setLastCheckedRequest(ResourceRequest());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (177646 => 177647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2014-12-22 20:13:02 UTC (rev 177646)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2014-12-22 20:13:07 UTC (rev 177647)
</span><span class="lines">@@ -235,10 +235,10 @@
</span><span class="cx"> void HistoryController::invalidateCurrentItemCachedPage()
</span><span class="cx"> {
</span><span class="cx"> // When we are pre-commit, the currentItem is where any page cache data resides.
</span><del>- if (!pageCache()->get(currentItem()))
</del><ins>+ if (!pageCache()->get(currentItem(), m_frame.page()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- std::unique_ptr<CachedPage> cachedPage = pageCache()->take(currentItem());
</del><ins>+ std::unique_ptr<CachedPage> cachedPage = pageCache()->take(currentItem(), m_frame.page());
</ins><span class="cx">
</span><span class="cx"> // FIXME: This is a grotesque hack to fix <rdar://problem/4059059> Crash in RenderFlow::detach
</span><span class="cx"> // Somehow the PageState object is not properly updated, and is holding onto a stale document.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (177646 => 177647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-22 20:13:02 UTC (rev 177646)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-22 20:13:07 UTC (rev 177647)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> static const char FeatureCounterPageCacheFailureReloadKey[] = "com.apple.WebKit.pageCache.failure.reload";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureReloadFromOriginKey[] = "com.apple.WebKit.pageCache.failure.reloadFromOrigin";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureSameLoadKey[] = "com.apple.WebKit.pageCache.failure.sameLoad";
</span><ins>+static const char FeatureCounterPageCacheFailureExpiredKey[] = "com.apple.WebKit.pageCache.failure.expired";
</ins><span class="cx"> static const char FeatureCounterPageCacheFailureKey[] = "com.apple.WebKit.pageCache.failure";
</span><span class="cx"> static const char FeatureCounterPageCacheSuccessKey[] = "com.apple.WebKit.pageCache.success";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>