<!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>[180770] trunk</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/180770">180770</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 11:22:10 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop unnecessary DatabaseManager::hasOpenDatabases() in PageCache::canCachePageContainingThisFrame()
https://bugs.webkit.org/show_bug.cgi?id=142052
Reviewed by Andreas Kling.
Source/WebCore:
Drop WebDatabase special-handling from PageCache::canCachePageContainingThisFrame().
DatabaseContext is already an ActiveDOMObject and DatabaseContext::canSuspend() was
returning false so pages using WebDatabase would never enter the PageCache anyway.
This patch also overrides ActiveDOMObject::canSuspend() in DatabaseContext to only
return false when there are open databases. This check is now equivalent to the one
that was in PageCache.
An issue that remains is that DatabaseContext::m_hasOpenDatabases is never reset
to false so once a page opened a database, it will never be page-cacheable. This
will be taken care of separately though.
Test: fast/history/page-cache-webdatabase-opened-db.html
* Modules/webdatabase/DatabaseContext.cpp:
(WebCore::DatabaseContext::canSuspend):
* Modules/webdatabase/DatabaseContext.h:
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::hasOpenDatabasesKey): Deleted.
* page/DiagnosticLoggingKeys.h:
LayoutTests:
Add a layout test to check that a page with an open WebDatabase does
not enter the PageCache.
* fast/history/page-cache-webdatabase-opened-db-expected.txt: Added.
* fast/history/page-cache-webdatabase-opened-db.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseContextcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseContexth">trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeyscpp">trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeysh">trunk/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthistorypagecachewebdatabaseopeneddbexpectedtxt">trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthistorypagecachewebdatabaseopeneddbhtml">trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/LayoutTests/ChangeLog 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-27 Chris Dumez <cdumez@apple.com>
+
+ Drop unnecessary DatabaseManager::hasOpenDatabases() in PageCache::canCachePageContainingThisFrame()
+ https://bugs.webkit.org/show_bug.cgi?id=142052
+
+ Reviewed by Andreas Kling.
+
+ Add a layout test to check that a page with an open WebDatabase does
+ not enter the PageCache.
+
+ * fast/history/page-cache-webdatabase-opened-db-expected.txt: Added.
+ * fast/history/page-cache-webdatabase-opened-db.html: Added.
+
</ins><span class="cx"> 2015-02-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Use after free in WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle
</span></span></pre></div>
<a id="trunkLayoutTestsfasthistorypagecachewebdatabaseopeneddbexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db-expected.txt (0 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db-expected.txt 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests that a page with an open WebDatabase does not go into the page cache.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+pageshow - not from cache
+PASS Page was not restored from page cache
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthistorypagecachewebdatabaseopeneddbhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db.html (0 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db.html (rev 0)
+++ trunk/LayoutTests/fast/history/page-cache-webdatabase-opened-db.html 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description('Tests that a page with an open WebDatabase does not go into the page cache.');
+window.jsTestIsAsync = true;
+
+if (window.testRunner) {
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ testRunner.clearAllDatabases();
+}
+
+window.addEventListener("pageshow", function(event) {
+ debug("pageshow - " + (event.persisted ? "" : "not ") + "from cache");
+ if (!window.sessionStorage.page_cache_open_webdatabase_test_started)
+ return;
+
+ delete window.sessionStorage.page_cache_open_webdatabase_test_started;
+
+ if (event.persisted)
+ testFailed("Page did enter and was restored from the page cache");
+ else
+ testPassed("Page was not restored from page cache");
+ finishJSTest();
+}, false);
+
+window.addEventListener("pagehide", function(event) {
+ debug("pagehide - " + (event.persisted ? "" : "not ") + "entering cache");
+ if (event.persisted) {
+ testFailed("Page entered the page cache.");
+ finishJSTest();
+ }
+}, false);
+
+window.addEventListener('load', function() {
+ // Open the database.
+ db = openDatabase("PageCacheTest", "", "Page Cache Test", 10, function (createdDb) {
+ // Force a back navigation back to this page.
+ window.sessionStorage.page_cache_open_webdatabase_test_started = true;
+ window.location.href = "resources/page-cache-helper.html";
+ });
+}, false);
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/Source/WebCore/ChangeLog 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-02-27 Chris Dumez <cdumez@apple.com>
+
+ Drop unnecessary DatabaseManager::hasOpenDatabases() in PageCache::canCachePageContainingThisFrame()
+ https://bugs.webkit.org/show_bug.cgi?id=142052
+
+ Reviewed by Andreas Kling.
+
+ Drop WebDatabase special-handling from PageCache::canCachePageContainingThisFrame().
+ DatabaseContext is already an ActiveDOMObject and DatabaseContext::canSuspend() was
+ returning false so pages using WebDatabase would never enter the PageCache anyway.
+
+ This patch also overrides ActiveDOMObject::canSuspend() in DatabaseContext to only
+ return false when there are open databases. This check is now equivalent to the one
+ that was in PageCache.
+
+ An issue that remains is that DatabaseContext::m_hasOpenDatabases is never reset
+ to false so once a page opened a database, it will never be page-cacheable. This
+ will be taken care of separately though.
+
+ Test: fast/history/page-cache-webdatabase-opened-db.html
+
+ * Modules/webdatabase/DatabaseContext.cpp:
+ (WebCore::DatabaseContext::canSuspend):
+ * Modules/webdatabase/DatabaseContext.h:
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::hasOpenDatabasesKey): Deleted.
+ * page/DiagnosticLoggingKeys.h:
+
</ins><span class="cx"> 2015-02-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Compile DFA to bytecode.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -145,6 +145,11 @@
</span><span class="cx"> stopDatabases();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool DatabaseContext::canSuspend() const
+{
+ return !hasOpenDatabases();
+}
+
</ins><span class="cx"> DatabaseThread* DatabaseContext::databaseThread()
</span><span class="cx"> {
</span><span class="cx"> if (!m_databaseThread && !m_hasOpenDatabases) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setHasOpenDatabases() { m_hasOpenDatabases = true; }
</span><del>- bool hasOpenDatabases() { return m_hasOpenDatabases; }
</del><ins>+ bool hasOpenDatabases() const { return m_hasOpenDatabases; }
</ins><span class="cx">
</span><span class="cx"> // When the database cleanup is done, the sychronizer will be signalled.
</span><span class="cx"> bool stopDatabases(DatabaseTaskSynchronizer*);
</span><span class="lines">@@ -73,9 +73,10 @@
</span><span class="cx">
</span><span class="cx"> void stopDatabases() { stopDatabases(nullptr); }
</span><span class="cx">
</span><del>- virtual void contextDestroyed() override final;
- virtual void stop() override final;
- virtual const char* activeDOMObjectName() const override { return "DatabaseContext"; }
</del><ins>+ void contextDestroyed() override;
+ void stop() override;
+ bool canSuspend() const override;
+ const char* activeDOMObjectName() const override { return "DatabaseContext"; }
</ins><span class="cx">
</span><span class="cx"> RefPtr<DatabaseThread> m_databaseThread;
</span><span class="cx"> bool m_hasOpenDatabases; // This never changes back to false, even after the database thread is closed.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "CachedPage.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><del>-#include "DatabaseManager.h"
</del><span class="cx"> #include "DeviceMotionController.h"
</span><span class="cx"> #include "DeviceOrientationController.h"
</span><span class="cx"> #include "DiagnosticLoggingClient.h"
</span><span class="lines">@@ -83,7 +82,7 @@
</span><span class="cx"> IsErrorPage,
</span><span class="cx"> HasPlugins,
</span><span class="cx"> IsHttpsAndCacheControlled,
</span><del>- HasDatabaseHandles,
</del><ins>+ HasDatabaseHandles, // FIXME: Remove.
</ins><span class="cx"> HasSharedWorkers, // FIXME: Remove.
</span><span class="cx"> NoHistoryItem,
</span><span class="cx"> QuickRedirectComing,
</span><span class="lines">@@ -153,11 +152,6 @@
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::httpsNoStoreKey());
</span><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="cx"> }
</span><del>- if (DatabaseManager::singleton().hasOpenDatabases(frame.document())) {
- PCLOG(" -Frame has open database handles");
- logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::hasOpenDatabasesKey());
- rejectReasons |= 1 << HasDatabaseHandles;
- }
</del><span class="cx"> if (!frame.loader().history().currentItem()) {
</span><span class="cx"> PCLOG(" -No current history item");
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::noCurrentHistoryItemKey());
</span><span class="lines">@@ -319,7 +313,6 @@
</span><span class="cx"> && !(documentLoader->substituteData().isValid() && !documentLoader->substituteData().failingURL().isEmpty())
</span><span class="cx"> && (!frameLoader.subframeLoader().containsPlugins() || frame.page()->settings().pageCacheSupportsPlugins())
</span><span class="cx"> && !(frame.isMainFrame() && document->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore())
</span><del>- && !DatabaseManager::singleton().hasOpenDatabases(document)
</del><span class="cx"> && frameLoader.history().currentItem()
</span><span class="cx"> && !frameLoader.quickRedirectComing()
</span><span class="cx"> && !documentLoader->isLoadingInAPISense()
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -223,11 +223,6 @@
</span><span class="cx"> return ASCIILiteral("isConditionalRequest");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::hasOpenDatabasesKey()
-{
- return ASCIILiteral("hasOpenDatabases");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::noCurrentHistoryItemKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("noCurrentHistoryItem");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (180769 => 180770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-02-27 19:20:27 UTC (rev 180769)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-02-27 19:22:10 UTC (rev 180770)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> static String engineFailedToLoadKey();
</span><span class="cx"> static String expiredKey();
</span><span class="cx"> static String fontKey();
</span><del>- static String hasOpenDatabasesKey();
</del><span class="cx"> static String hasPluginsKey();
</span><span class="cx"> static String httpsNoStoreKey();
</span><span class="cx"> static String imageKey();
</span></span></pre>
</div>
</div>
</body>
</html>