<!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>[182544] 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/182544">182544</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 09:45:01 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for clarity
https://bugs.webkit.org/show_bug.cgi?id=143513
Reviewed by Andreas Kling.
Source/WebCore:
Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for
clarity as it is only used for the page cache. Also rename the
'DocumentWillBecomeInactive' value of the ReasonForSuspension enum to
'PageCache' as it is only used by CachedFrame for the page cache and it
is a lot more understandable.
Source/WebKit/mac:
Update ScriptExecutionContext::canSuspendActiveDOMObjects() to
canSuspendActiveDOMObjectsForPageCache() as the method was renamed.
* WebView/WebFrame.mm:
(-[WebFrame _cacheabilityDictionary]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryManagercpp">trunk/Source/WebCore/Modules/battery/BatteryManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryManagerh">trunk/Source/WebCore/Modules/battery/BatteryManager.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationcpp">trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationh">trunk/Source/WebCore/Modules/geolocation/Geolocation.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequesth">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourcecpp">trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceh">trunk/Source/WebCore/Modules/mediasource/MediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBufferh">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionRequestImplcpp">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionRequestImplh">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplcpp">trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplh">trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCVoidRequestImplcpp">trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCVoidRequestImplh">trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationcpp">trunk/Source/WebCore/Modules/notifications/Notification.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationh">trunk/Source/WebCore/Modules/notifications/Notification.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationCentercpp">trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationCenterh">trunk/Source/WebCore/Modules/notifications/NotificationCenter.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamcpp">trunk/Source/WebCore/Modules/streams/ReadableStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamh">trunk/Source/WebCore/Modules/streams/ReadableStream.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReadercpp">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReaderh">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContexth">trunk/Source/WebCore/Modules/webaudio/AudioContext.h</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="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketh">trunk/Source/WebCore/Modules/websockets/WebSocket.h</a></li>
<li><a href="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontLoaderh">trunk/Source/WebCore/css/FontLoader.h</a></li>
<li><a href="#trunkSourceWebCoredomActiveDOMObjectcpp">trunk/Source/WebCore/dom/ActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCoredomActiveDOMObjecth">trunk/Source/WebCore/dom/ActiveDOMObject.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReadercpp">trunk/Source/WebCore/fileapi/FileReader.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderh">trunk/Source/WebCore/fileapi/FileReader.h</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementcpp">trunk/Source/WebCore/html/HTMLMarqueeElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementh">trunk/Source/WebCore/html/HTMLMarqueeElement.h</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="#trunkSourceWebCorehtmlPublicURLManagercpp">trunk/Source/WebCore/html/PublicURLManager.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlPublicURLManagerh">trunk/Source/WebCore/html/PublicURLManager.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventSourceh">trunk/Source/WebCore/page/EventSource.h</a></li>
<li><a href="#trunkSourceWebCorepageSuspendableTimercpp">trunk/Source/WebCore/page/SuspendableTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSuspendableTimerh">trunk/Source/WebCore/page/SuspendableTimer.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkercpp">trunk/Source/WebCore/workers/Worker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerh">trunk/Source/WebCore/workers/Worker.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequesth">trunk/Source/WebCore/xml/XMLHttpRequest.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-08 Chris Dumez <cdumez@apple.com>
+
+ Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for clarity
+ https://bugs.webkit.org/show_bug.cgi?id=143513
+
+ Reviewed by Andreas Kling.
+
+ Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for
+ clarity as it is only used for the page cache. Also rename the
+ 'DocumentWillBecomeInactive' value of the ReasonForSuspension enum to
+ 'PageCache' as it is only used by CachedFrame for the page cache and it
+ is a lot more understandable.
+
</ins><span class="cx"> 2015-04-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r182536.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryManager.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryManager.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/battery/BatteryManager.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> m_batteryStatus = batteryStatus;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool BatteryManager::canSuspend() const
</del><ins>+bool BatteryManager::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryManager.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryManager.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/battery/BatteryManager.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> explicit BatteryManager(Navigator*);
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void suspend(ReasonForSuspension) override;
</span><span class="cx"> void resume() override;
</span><span class="cx"> void stop() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> return "MediaKeySession";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaKeySession::canSuspend() const
</del><ins>+bool MediaKeySession::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> return document() ? document()->page() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Geolocation::canSuspend() const
</del><ins>+bool Geolocation::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return !hasListeners();
</span><span class="cx"> }
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Allow pages that no longer have listeners to enter the page cache.
</span><span class="cx"> // Have them stop updating and reset geolocation permissions when the page is resumed.
</span><del>- if (reason == ActiveDOMObject::DocumentWillBecomeInactive) {
</del><ins>+ if (reason == ActiveDOMObject::PageCache) {
</ins><span class="cx"> ASSERT(!hasListeners());
</span><span class="cx"> stop();
</span><span class="cx"> m_resetOnResume = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Geolocation.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> void stop() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void suspend(ReasonForSuspension) override;
</span><span class="cx"> void resume() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> return "IDBDatabase";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IDBDatabase::canSuspend() const
</del><ins>+bool IDBDatabase::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return m_isClosed;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> // EventTarget
</span><span class="cx"> virtual void refEventTarget() override final { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> markEarlyDeath();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IDBRequest::canSuspend() const
</del><ins>+bool IDBRequest::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return !m_hasPendingActivity;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> // EventTarget API.
</span><span class="cx"> virtual void refEventTarget() override final { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> return returnValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IDBTransaction::canSuspend() const
</del><ins>+bool IDBTransaction::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Technically we can suspend before the first request is schedule
</span><span class="cx"> // and after the complete/abort event is enqueued.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> void unregisterOpenCursor(IDBCursor*);
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx"> m_private.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaSource::canSuspend() const
</del><ins>+bool MediaSource::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return isClosed() && !m_asyncEventQueue.hasPendingEvents();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx">
</span><span class="cx"> void onReadyStateChange(const AtomicString& oldState, const AtomicString& newState);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> m_removeTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SourceBuffer::canSuspend() const
</del><ins>+bool SourceBuffer::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return !hasPendingActivity();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> // SourceBufferPrivateClient
</span><span class="cx"> virtual void sourceBufferPrivateDidEndStream(SourceBufferPrivate*, const WTF::AtomicString&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> return "MediaStreamTrack";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStreamTrack::canSuspend() const
</del><ins>+bool MediaStreamTrack::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override final;
</span><span class="cx"> const char* activeDOMObjectName() const override final;
</span><del>- bool canSuspend() const override final;
</del><ins>+ bool canSuspendForPageCache() const override final;
</ins><span class="cx">
</span><span class="cx"> // EventTarget
</span><span class="cx"> virtual void refEventTarget() override final { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> return "RTCDTMFSender";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCDTMFSender::canSuspend() const
</del><ins>+bool RTCDTMFSender::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><span class="cx"> void scheduledEventTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -695,7 +695,7 @@
</span><span class="cx"> return "RTCPeerConnection";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCPeerConnection::canSuspend() const
</del><ins>+bool RTCPeerConnection::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void changeSignalingState(SignalingState);
</span><span class="cx"> void changeIceGatheringState(IceGatheringState);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> return "RTCSessionDescriptionRequestImpl";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCSessionDescriptionRequestImpl::canSuspend() const
</del><ins>+bool RTCSessionDescriptionRequestImpl::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> return "RTCStatsRequestImpl";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCStatsRequestImpl::canSuspend() const
</del><ins>+bool RTCStatsRequestImpl::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCVoidRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> return "RTCVoidRequestImpl";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RTCVoidRequestImpl::canSuspend() const
</del><ins>+bool RTCVoidRequestImpl::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCVoidRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> RefPtr<VoidCallback> m_successCallback;
</span><span class="cx"> RefPtr<RTCPeerConnectionErrorCallback> m_errorCallback;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/notifications/Notification.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> return "Notification";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Notification::canSuspend() const
</del><ins>+bool Notification::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // We can suspend if the Notification is not shown yet or after it is closed.
</span><span class="cx"> return m_state == Idle || m_state == Closed;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/notifications/Notification.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void contextDestroyed() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> // EventTarget API.
</span><span class="cx"> virtual void refEventTarget() override { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return "NotificationCenter";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool NotificationCenter::canSuspend() const
</del><ins>+bool NotificationCenter::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // We don't need to worry about Notifications because those are ActiveDOMObject too.
</span><span class="cx"> // The NotificationCenter can safely be suspended if there are no pending permission
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationCenterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationCenter.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationCenter.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/notifications/NotificationCenter.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> class NotificationRequestCallback : public RefCounted<NotificationRequestCallback> {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> return "ReadableStream";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ReadableStream::canSuspend() const
</del><ins>+bool ReadableStream::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> private:
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> State m_state;
</span><span class="cx"> Ref<ReadableStreamSource> m_source;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return "ReadableStreamReader";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ReadableStreamReader::canSuspend() const
</del><ins>+bool ReadableStreamReader::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> private:
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> RefPtr<ReadableStream> m_stream;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> callOnMainThread(stopDispatch, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AudioContext::canSuspend() const
</del><ins>+bool AudioContext::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should be able to suspend while rendering as well with some more code.
</span><span class="cx"> return m_state == State::Suspended || m_state == State::Closed;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx">
</span><span class="cx"> // When the context goes away, there might still be some sources which haven't finished playing.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> stopDatabases();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DatabaseContext::canSuspend() const
</del><ins>+bool DatabaseContext::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasOpenDatabases() || !m_databaseThread)
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> void contextDestroyed() override;
</span><span class="cx"> void stop() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> const char* activeDOMObjectName() const override { return "DatabaseContext"; }
</span><span class="cx">
</span><span class="cx"> RefPtr<DatabaseThread> m_databaseThread;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> ActiveDOMObject::contextDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebSocket::canSuspend() const
</del><ins>+bool WebSocket::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx"> m_resumeTimer.stop();
</span><span class="cx">
</span><span class="cx"> if (m_channel) {
</span><del>- if (reason == ActiveDOMObject::DocumentWillBecomeInactive) {
</del><ins>+ if (reason == ActiveDOMObject::PageCache) {
</ins><span class="cx"> // The page will enter the page cache, close the channel but only fire the close event after resuming.
</span><span class="cx"> m_shouldDelayCloseEvent = true;
</span><span class="cx"> // This will cause didClose() to be called.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void contextDestroyed() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void suspend(ReasonForSuspension) override;
</span><span class="cx"> void resume() override;
</span><span class="cx"> void stop() override;
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> return "FontLoader";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FontLoader::canSuspend() const
</del><ins>+bool FontLoader::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return !m_numLoadingFromCSS && !m_numLoadingFromJS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/css/FontLoader.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void pendingEventsTimerFired() { firePendingEvents(); }
</span><span class="cx"> void scheduleEvent(PassRefPtr<Event>);
</span></span></pre></div>
<a id="trunkSourceWebCoredomActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ActiveDOMObject.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ActiveDOMObject.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/dom/ActiveDOMObject.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> return m_pendingActivityCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ActiveDOMObject::canSuspend() const
</del><ins>+bool ActiveDOMObject::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomActiveDOMObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ActiveDOMObject.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ActiveDOMObject.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/dom/ActiveDOMObject.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -42,18 +42,18 @@
</span><span class="cx">
</span><span class="cx"> virtual bool hasPendingActivity() const;
</span><span class="cx">
</span><del>- // The canSuspend function is used by the caller if there is a choice between suspending
</del><ins>+ // The canSuspendForPageCache() function is used by the caller if there is a choice between suspending
</ins><span class="cx"> // and stopping. For example, a page won't be suspended and placed in the back/forward
</span><span class="cx"> // cache if it contains any objects that cannot be suspended.
</span><span class="cx">
</span><del>- // However, the suspend function will sometimes be called even if canSuspend returns false.
</del><ins>+ // However, the suspend function will sometimes be called even if canSuspendForPageCache() returns false.
</ins><span class="cx"> // That happens in step-by-step JS debugging for example - in this case it would be incorrect
</span><span class="cx"> // to stop the object. Exact semantics of suspend is up to the object in cases like that.
</span><span class="cx">
</span><span class="cx"> enum ReasonForSuspension {
</span><span class="cx"> JavaScriptDebuggerPaused,
</span><span class="cx"> WillDeferLoading,
</span><del>- DocumentWillBecomeInactive,
</del><ins>+ PageCache,
</ins><span class="cx"> PageWillBeSuspended,
</span><span class="cx"> DocumentWillBePaused
</span><span class="cx"> };
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> // These three functions must not have a side effect of creating or destroying
</span><span class="cx"> // any ActiveDOMObject. That means they must not result in calls to arbitrary JavaScript.
</span><del>- virtual bool canSuspend() const = 0; // Returning false in canSuspend() will prevent the page from entering the PageCache.
</del><ins>+ virtual bool canSuspendForPageCache() const = 0; // Returning false in canSuspendForPageCache() will prevent the page from entering the PageCache.
</ins><span class="cx"> virtual void suspend(ReasonForSuspension);
</span><span class="cx"> virtual void resume();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScriptExecutionContext::canSuspendActiveDOMObjects(Vector<ActiveDOMObject*>* unsuspendableObjects)
</del><ins>+bool ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache(Vector<ActiveDOMObject*>* unsuspendableObjects)
</ins><span class="cx"> {
</span><span class="cx"> checkConsistency();
</span><span class="cx">
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> // An ASSERT or RELEASE_ASSERT will fire if this happens, but it's important to code
</span><span class="cx"> // canSuspend functions so it will not happen!
</span><span class="cx"> for (auto* activeDOMObject : m_activeDOMObjects) {
</span><del>- if (!activeDOMObject->canSuspend()) {
</del><ins>+ if (!activeDOMObject->canSuspendForPageCache()) {
</ins><span class="cx"> canSuspend = false;
</span><span class="cx"> if (unsuspendableObjects)
</span><span class="cx"> unsuspendableObjects->append(activeDOMObject);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> PublicURLManager& publicURLManager();
</span><span class="cx">
</span><span class="cx"> // Active objects are not garbage collected even if inaccessible, e.g. because their activity may result in callbacks being invoked.
</span><del>- WEBCORE_EXPORT bool canSuspendActiveDOMObjects(Vector<ActiveDOMObject*>* unsuspendableObjects = nullptr);
</del><ins>+ WEBCORE_EXPORT bool canSuspendActiveDOMObjectsForPageCache(Vector<ActiveDOMObject*>* unsuspendableObjects = nullptr);
</ins><span class="cx">
</span><del>- // Active objects can be asked to suspend even if canSuspendActiveDOMObjects() returns 'false' -
</del><ins>+ // Active objects can be asked to suspend even if canSuspendActiveDOMObjectsForPageCache() returns 'false' -
</ins><span class="cx"> // step-by-step JS debugging is one example.
</span><span class="cx"> virtual void suspendActiveDOMObjects(ActiveDOMObject::ReasonForSuspension);
</span><span class="cx"> virtual void resumeActiveDOMObjects(ActiveDOMObject::ReasonForSuspension);
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> terminate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FileReader::canSuspend() const
</del><ins>+bool FileReader::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: It is not currently possible to suspend a FileReader, so pages with FileReader can not go into page cache.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/fileapi/FileReader.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void stop() override;
</span><span class="cx">
</span><span class="cx"> // EventTarget
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> m_document->accessSVGExtensions().unpauseAnimations();
</span><span class="cx">
</span><span class="cx"> frame.animation().resumeAnimationsForDocument(m_document.get());
</span><del>- m_document->resumeActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);
</del><ins>+ m_document->resumeActiveDOMObjects(ActiveDOMObject::PageCache);
</ins><span class="cx"> m_document->resumeScriptedAnimationControllerCallbacks();
</span><span class="cx">
</span><span class="cx"> // It is necessary to update any platform script objects after restoring the
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> // those create more objects.
</span><span class="cx"> m_document->documentWillSuspendForPageCache();
</span><span class="cx"> m_document->suspendScriptedAnimationControllerCallbacks();
</span><del>- m_document->suspendActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);
</del><ins>+ m_document->suspendActiveDOMObjects(ActiveDOMObject::PageCache);
</ins><span class="cx"> m_cachedFrameScriptData = std::make_unique<ScriptCachedFrameData>(frame);
</span><span class="cx">
</span><span class="cx"> m_document->domWindow()->suspendForPageCache();
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<ActiveDOMObject*> unsuspendableObjects;
</span><del>- if (!frame.document()->canSuspendActiveDOMObjects(&unsuspendableObjects)) {
</del><ins>+ if (!frame.document()->canSuspendActiveDOMObjectsForPageCache(&unsuspendableObjects)) {
</ins><span class="cx"> PCLOG(" -The document cannot suspend its active DOM Objects");
</span><span class="cx"> for (auto* activeDOMObject : unsuspendableObjects) {
</span><span class="cx"> PCLOG(" - Unsuspendable: ", activeDOMObject->activeDOMObjectName());
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> && !frameLoader.quickRedirectComing()
</span><span class="cx"> && !documentLoader->isLoadingInAPISense()
</span><span class="cx"> && !documentLoader->isStopping()
</span><del>- && document->canSuspendActiveDOMObjects()
</del><ins>+ && document->canSuspendActiveDOMObjectsForPageCache()
</ins><span class="cx"> // FIXME: We should investigating caching frames that have an associated
</span><span class="cx"> // application cache. <rdar://problem/5917899> tracks that work.
</span><span class="cx"> && documentLoader->applicationCacheHost()->canCacheInPageCache()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> setIntegralAttribute(loopAttr, loop);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMarqueeElement::canSuspend() const
</del><ins>+bool HTMLMarqueeElement::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject
</span><del>- virtual bool canSuspend() const override;
</del><ins>+ virtual bool canSuspendForPageCache() const override;
</ins><span class="cx"> virtual void suspend(ReasonForSuspension) override;
</span><span class="cx"> virtual void resume() override;
</span><span class="cx"> virtual const char* activeDOMObjectName() const override { return "HTMLMarqueeElement"; }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -4684,7 +4684,7 @@
</span><span class="cx"> updateSleepDisabling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMediaElement::canSuspend() const
</del><ins>+bool HTMLMediaElement::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -4732,7 +4732,7 @@
</span><span class="cx">
</span><span class="cx"> switch (why)
</span><span class="cx"> {
</span><del>- case DocumentWillBecomeInactive:
</del><ins>+ case PageCache:
</ins><span class="cx"> stop();
</span><span class="cx"> m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequirePageConsentToResumeMedia);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void suspend(ReasonForSuspension) override;
</span><span class="cx"> void resume() override;
</span><span class="cx"> void stop() override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlPublicURLManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/PublicURLManager.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/PublicURLManager.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/PublicURLManager.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> m_registryToURL.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PublicURLManager::canSuspend() const
</del><ins>+bool PublicURLManager::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // Suspending an PublicURLManager is safe as it does not cause any JS to be executed.
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlPublicURLManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/PublicURLManager.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/PublicURLManager.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/PublicURLManager.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> private:
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx">
</span><span class="cx"> typedef HashSet<String> URLSet;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -3904,7 +3904,7 @@
</span><span class="cx"> return "WebGLRenderingContext";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLRenderingContextBase::canSuspend() const
</del><ins>+bool WebGLRenderingContextBase::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> virtual bool hasPendingActivity() const override;
</span><span class="cx"> virtual void stop() override;
</span><span class="cx"> virtual const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void addSharedObject(WebGLSharedObject*);
</span><span class="cx"> void addContextObject(WebGLContextObject*);
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/page/EventSource.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -421,7 +421,7 @@
</span><span class="cx"> return "EventSource";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventSource::canSuspend() const
</del><ins>+bool EventSource::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should try and do better here.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/page/EventSource.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx">
</span><span class="cx"> void connect();
</span><span class="cx"> void networkRequestEnded();
</span></span></pre></div>
<a id="trunkSourceWebCorepageSuspendableTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SuspendableTimer.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SuspendableTimer.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/page/SuspendableTimer.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> start(m_savedNextFireInterval, m_savedRepeatInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SuspendableTimer::canSuspend() const
</del><ins>+bool SuspendableTimer::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSuspendableTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SuspendableTimer.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SuspendableTimer.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/page/SuspendableTimer.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> // ActiveDOMObject API.
</span><span class="cx"> bool hasPendingActivity() const override final;
</span><span class="cx"> void stop() override final;
</span><del>- bool canSuspend() const override final;
</del><ins>+ bool canSuspendForPageCache() const override final;
</ins><span class="cx"> void suspend(ReasonForSuspension) override final;
</span><span class="cx"> void resume() override final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/workers/Worker.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> m_contextProxy->terminateWorkerGlobalScope();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Worker::canSuspend() const
</del><ins>+bool Worker::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: It is not currently possible to suspend a worker, so pages with workers can not go into page cache.
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/workers/Worker.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> virtual void notifyFinished() override;
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject API.
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void stop() override;
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -1250,7 +1250,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool XMLHttpRequest::canSuspend() const
</del><ins>+bool XMLHttpRequest::canSuspendForPageCache() const
</ins><span class="cx"> {
</span><span class="cx"> // If the load event has not fired yet, cancelling the load in suspend() may cause
</span><span class="cx"> // the load event to be fired and arbitrary JS execution, which would be unsafe.
</span><span class="lines">@@ -1274,7 +1274,7 @@
</span><span class="cx"> m_dispatchErrorOnResuming = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (reason == ActiveDOMObject::DocumentWillBecomeInactive && m_loader) {
</del><ins>+ if (reason == ActiveDOMObject::PageCache && m_loader) {
</ins><span class="cx"> // Going into PageCache, abort the request and dispatch a network error on resuming.
</span><span class="cx"> genericError();
</span><span class="cx"> m_dispatchErrorOnResuming = true;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> void contextDestroyed() override;
</span><del>- bool canSuspend() const override;
</del><ins>+ bool canSuspendForPageCache() const override;
</ins><span class="cx"> void suspend(ReasonForSuspension) override;
</span><span class="cx"> void resume() override;
</span><span class="cx"> void stop() override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-08 Chris Dumez <cdumez@apple.com>
+
+ Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for clarity
+ https://bugs.webkit.org/show_bug.cgi?id=143513
+
+ Reviewed by Andreas Kling.
+
+ Update ScriptExecutionContext::canSuspendActiveDOMObjects() to
+ canSuspendActiveDOMObjectsForPageCache() as the method was renamed.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _cacheabilityDictionary]):
+
</ins><span class="cx"> 2015-04-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (182543 => 182544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-04-08 16:31:01 UTC (rev 182543)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-04-08 16:45:01 UTC (rev 182544)
</span><span class="lines">@@ -2079,7 +2079,7 @@
</span><span class="cx"> if (Document* document = _private->coreFrame->document()) {
</span><span class="cx"> if (DatabaseManager::singleton().hasOpenDatabases(document))
</span><span class="cx"> [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
</span><del>- if (!document->canSuspendActiveDOMObjects())
</del><ins>+ if (!document->canSuspendActiveDOMObjectsForPageCache())
</ins><span class="cx"> [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameCanSuspendActiveDOMObjects];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>