<!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>[194006] 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/194006">194006</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-12 01:26:42 -0800 (Sat, 12 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Safari background tabs should be fully suspended where possible.
https://bugs.webkit.org/show_bug.cgi?id=150515
Patch by Katlyn Graff <kgraff@apple.com> on 2015-12-12
Reviewed by Ryosuke Niwa.
Source/WebCore:
Support for tab suspension for Mac, enabled by defaults writing to WebKitTabSuspension.
Page-down suspension consolidated with PageCache suspension code in Document::
suspend and Document::resume. Pages canTabSuspend if cacheable, nonvisible, nonprerender,
and nonactive.
* dom/Document.cpp: moved scrollbar handling from setInPageCache to suspend/resume
(WebCore::Document::suspend): moved scrollbar, dom, animation, timer, and visual update suspending into here
(WebCore::Document::resume): moved scrollbar, dom, animation, timer, and visual update resuming into here
* dom/Document.h: added m_isSuspended to prevent repeat calls from PageCache/Tab Suspension contention
* history/CachedFrame.cpp: moved dom, animation, and timer suspension into Document::suspend
(WebCore::CachedFrame::CachedFrame):
* history/PageCache.cpp: Added a few nullchecks to prevent crashes if canCacheFrame is called but document is null
(WebCore::PageCache::canCacheFrame):
* page/Page.cpp:
(WebCore::Page::Page): Added timer to fire delayed suspension
(WebCore::Page::setPageActivityState): Added a call to schedule tab suspension
(WebCore::Page::setIsVisibleInternal): Added a call to schedule tab suspension
(WebCore::Page::canTabSuspend): Added support for suspending if cacheable, nonvisible, nonprerender, and nonactive
(WebCore::Page::setIsTabSuspended): Added a function to suspend or resume tabs
(WebCore::Page::setTabSuspensionEnabled): Added support for a defaults write enable
(WebCore::Page::scheduleTabSuspension): Added ability to schedule the suspension timer to fire or resume
(WebCore::Page::timerFired): Added a suspension timer
* page/Page.h:
* page/PageThrottler.h:
(WebCore::PageThrottler::activityState): Added access to m_activityState for canTabSuspend
Source/WebKit2:
Added a runtime flag enabling tab suspension, default off.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.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="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagePageThrottlerh">trunk/Source/WebCore/page/PageThrottler.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/ChangeLog 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-12-12 Katlyn Graff <kgraff@apple.com>
+
+ Safari background tabs should be fully suspended where possible.
+ https://bugs.webkit.org/show_bug.cgi?id=150515
+
+ Reviewed by Ryosuke Niwa.
+
+ Support for tab suspension for Mac, enabled by defaults writing to WebKitTabSuspension.
+ Page-down suspension consolidated with PageCache suspension code in Document::
+ suspend and Document::resume. Pages canTabSuspend if cacheable, nonvisible, nonprerender,
+ and nonactive.
+
+ * dom/Document.cpp: moved scrollbar handling from setInPageCache to suspend/resume
+ (WebCore::Document::suspend): moved scrollbar, dom, animation, timer, and visual update suspending into here
+ (WebCore::Document::resume): moved scrollbar, dom, animation, timer, and visual update resuming into here
+ * dom/Document.h: added m_isSuspended to prevent repeat calls from PageCache/Tab Suspension contention
+ * history/CachedFrame.cpp: moved dom, animation, and timer suspension into Document::suspend
+ (WebCore::CachedFrame::CachedFrame):
+ * history/PageCache.cpp: Added a few nullchecks to prevent crashes if canCacheFrame is called but document is null
+ (WebCore::PageCache::canCacheFrame):
+ * page/Page.cpp:
+ (WebCore::Page::Page): Added timer to fire delayed suspension
+ (WebCore::Page::setPageActivityState): Added a call to schedule tab suspension
+ (WebCore::Page::setIsVisibleInternal): Added a call to schedule tab suspension
+ (WebCore::Page::canTabSuspend): Added support for suspending if cacheable, nonvisible, nonprerender, and nonactive
+ (WebCore::Page::setIsTabSuspended): Added a function to suspend or resume tabs
+ (WebCore::Page::setTabSuspensionEnabled): Added support for a defaults write enable
+ (WebCore::Page::scheduleTabSuspension): Added ability to schedule the suspension timer to fire or resume
+ (WebCore::Page::timerFired): Added a suspension timer
+ * page/Page.h:
+ * page/PageThrottler.h:
+ (WebCore::PageThrottler::activityState): Added access to m_activityState for canTabSuspend
+
</ins><span class="cx"> 2015-12-11 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Mousewheel events don't work in iframes in RTL documents
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -4573,9 +4573,6 @@
</span><span class="cx"> FrameView* v = view();
</span><span class="cx"> Page* page = this->page();
</span><span class="cx">
</span><del>- if (page)
- page->lockAllOverlayScrollbarsToHidden(flag);
-
</del><span class="cx"> if (flag) {
</span><span class="cx"> if (v) {
</span><span class="cx"> // FIXME: There is some scrolling related work that needs to happen whenever a page goes into the
</span><span class="lines">@@ -4608,6 +4605,9 @@
</span><span class="cx">
</span><span class="cx"> void Document::suspend()
</span><span class="cx"> {
</span><ins>+ if (m_isSuspended)
+ return;
+
</ins><span class="cx"> documentWillBecomeInactive();
</span><span class="cx">
</span><span class="cx"> for (auto* element : m_documentSuspensionCallbackElements)
</span><span class="lines">@@ -4619,14 +4619,31 @@
</span><span class="cx"> m_didDispatchViewportPropertiesChanged = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ ASSERT(page());
+ page()->lockAllOverlayScrollbarsToHidden(true);
+
</ins><span class="cx"> if (RenderView* view = renderView()) {
</span><span class="cx"> if (view->usesCompositing())
</span><span class="cx"> view->compositor().cancelCompositingLayerUpdate();
</span><span class="cx"> }
</span><ins>+
+ suspendScriptedAnimationControllerCallbacks();
+ suspendActiveDOMObjects(ActiveDOMObject::PageCache);
+
+ ASSERT(m_frame);
+ m_frame->clearTimers();
+
+ m_visualUpdatesAllowed = false;
+ m_visualUpdatesSuppressionTimer.stop();
+
+ m_isSuspended = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::resume()
</span><span class="cx"> {
</span><ins>+ if (!m_isSuspended)
+ return;
+
</ins><span class="cx"> Vector<Element*> elements;
</span><span class="cx"> copyToVector(m_documentSuspensionCallbackElements, elements);
</span><span class="cx"> for (auto* element : elements)
</span><span class="lines">@@ -4640,6 +4657,14 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_frame);
</span><span class="cx"> m_frame->loader().client().dispatchDidBecomeFrameset(isFrameSet());
</span><ins>+ m_frame->animation().resumeAnimationsForDocument(this);
+
+ resumeActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
+ resumeScriptedAnimationControllerCallbacks();
+
+ m_visualUpdatesAllowed = true;
+
+ m_isSuspended = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::registerForDocumentSuspensionCallbacks(Element* e)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/dom/Document.h 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -1764,6 +1764,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_hasStyleWithViewportUnits;
</span><span class="cx"> bool m_isTimerThrottlingEnabled { false };
</span><ins>+ bool m_isSuspended { false };
</ins><span class="cx">
</span><span class="cx"> HashSet<MediaProducer*> m_audioProducers;
</span><span class="cx"> MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -165,9 +165,9 @@
</span><span class="cx"> // but after we've fired the pagehide event, in case that creates more objects.
</span><span class="cx"> // Suspending must also happen after we've recursed over child frames, in case
</span><span class="cx"> // those create more objects.
</span><ins>+
</ins><span class="cx"> m_document->suspend();
</span><del>- m_document->suspendScriptedAnimationControllerCallbacks();
- m_document->suspendActiveDOMObjects(ActiveDOMObject::PageCache);
</del><ins>+
</ins><span class="cx"> m_cachedFrameScriptData = std::make_unique<ScriptCachedFrameData>(frame);
</span><span class="cx">
</span><span class="cx"> m_document->domWindow()->suspendForDocumentSuspension();
</span><span class="lines">@@ -179,9 +179,6 @@
</span><span class="cx">
</span><span class="cx"> frame.view()->clearScrollableAreas();
</span><span class="cx">
</span><del>- // suspend() can set up a layout timer on the FrameView, so clear timers after that.
- frame.clearTimers();
-
</del><span class="cx"> // Deconstruct the FrameTree, to restore it later.
</span><span class="cx"> // We do this for two reasons:
</span><span class="cx"> // 1 - We reuse the main frame, so when it navigates to a new page load it needs to start with a blank FrameTree.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::hasPluginsKey());
</span><span class="cx"> isCacheable = false;
</span><span class="cx"> }
</span><del>- if (frame.isMainFrame() && frame.document()->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore()) {
</del><ins>+ if (frame.isMainFrame() && frame.document() && frame.document()->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore()) {
</ins><span class="cx"> PCLOG(" -Frame is HTTPS, and cache control prohibits storing");
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::httpsNoStoreKey());
</span><span class="cx"> isCacheable = false;
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<ActiveDOMObject*> unsuspendableObjects;
</span><del>- if (!frame.document()->canSuspendActiveDOMObjectsForDocumentSuspension(&unsuspendableObjects)) {
</del><ins>+ if (frame.document() && !frame.document()->canSuspendActiveDOMObjectsForDocumentSuspension(&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></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/page/Page.cpp 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const ViewState::Flags PageInitialViewState = ViewState::IsVisible | ViewState::IsInWindow;
</span><ins>+bool Page::s_tabSuspensionIsEnabled = false;
</ins><span class="cx">
</span><span class="cx"> Page::Page(PageConfiguration& pageConfiguration)
</span><span class="cx"> : m_chrome(std::make_unique<Chrome>(*this, *pageConfiguration.chromeClient))
</span><span class="lines">@@ -223,6 +224,7 @@
</span><span class="cx"> , m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
</span><span class="cx"> , m_sessionID(SessionID::defaultSessionID())
</span><span class="cx"> , m_isClosing(false)
</span><ins>+ , m_tabSuspensionTimer(*this, &Page::tabSuspensionTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> setTimerThrottlingEnabled(m_viewState & ViewState::IsVisuallyIdle);
</span><span class="cx">
</span><span class="lines">@@ -1293,6 +1295,11 @@
</span><span class="cx"> void Page::setPageActivityState(PageActivityState::Flags activityState)
</span><span class="cx"> {
</span><span class="cx"> chrome().client().setPageActivityState(activityState);
</span><ins>+
+ if (activityState == PageActivityState::NoFlags && !isVisible())
+ scheduleTabSuspension(true);
+ else
+ scheduleTabSuspension(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setIsVisible(bool isVisible)
</span><span class="lines">@@ -1344,6 +1351,8 @@
</span><span class="cx"> if (FrameView* view = mainFrame().view())
</span><span class="cx"> view->hide();
</span><span class="cx"> }
</span><ins>+
+ scheduleTabSuspension(!isVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setIsPrerender()
</span><span class="lines">@@ -1843,4 +1852,48 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+bool Page::canTabSuspend()
+{
+ return s_tabSuspensionIsEnabled && !m_isPrerender && (m_pageThrottler.activityState() == PageActivityState::NoFlags) && PageCache::singleton().canCache(this);
+}
+
+void Page::setIsTabSuspended(bool shouldSuspend)
+{
+ for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (auto* document = frame->document()) {
+ if (shouldSuspend)
+ document->suspend();
+ else
+ document->resume();
+ }
+ }
+}
+
+void Page::setTabSuspensionEnabled(bool enable)
+{
+ s_tabSuspensionIsEnabled = enable;
+}
+
+void Page::scheduleTabSuspension(bool shouldSuspend)
+{
+ if (m_shouldTabSuspend == shouldSuspend)
+ return;
+
+ if (shouldSuspend && canTabSuspend()) {
+ m_shouldTabSuspend = shouldSuspend;
+ m_tabSuspensionTimer.startOneShot(0);
+ } else {
+ m_tabSuspensionTimer.stop();
+ if (!shouldSuspend) {
+ m_shouldTabSuspend = shouldSuspend;
+ setIsTabSuspended(false);
+ }
+ }
+}
+
+void Page::tabSuspensionTimerFired()
+{
+ setIsTabSuspended(true);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/page/Page.h 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static void updateStyleForAllPagesAfterGlobalChangeInEnvironment();
</span><span class="cx"> WEBCORE_EXPORT static void clearPreviousItemFromAllPages(HistoryItem*);
</span><ins>+ WEBCORE_EXPORT static void setTabSuspensionEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT explicit Page(PageConfiguration&);
</span><span class="cx"> WEBCORE_EXPORT ~Page();
</span><span class="lines">@@ -365,6 +366,8 @@
</span><span class="cx"> // with exponential growth in the number of frames.
</span><span class="cx"> static const int maxNumberOfFrames = 1000;
</span><span class="cx">
</span><ins>+ static bool s_tabSuspensionIsEnabled;
+
</ins><span class="cx"> void setEditable(bool isEditable) { m_isEditable = isEditable; }
</span><span class="cx"> bool isEditable() { return m_isEditable; }
</span><span class="cx">
</span><span class="lines">@@ -491,6 +494,7 @@
</span><span class="cx">
</span><span class="cx"> void setShowAllPlugins(bool showAll) { m_showAllPlugins = showAll; }
</span><span class="cx"> bool showAllPlugins() const;
</span><ins>+ void setIsTabSuspended(bool);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span><span class="lines">@@ -516,6 +520,9 @@
</span><span class="cx">
</span><span class="cx"> void hiddenPageDOMTimerThrottlingStateChanged();
</span><span class="cx"> void setTimerThrottlingEnabled(bool);
</span><ins>+ bool canTabSuspend();
+ void scheduleTabSuspension(bool);
+ void tabSuspensionTimerFired();
</ins><span class="cx">
</span><span class="cx"> const std::unique_ptr<Chrome> m_chrome;
</span><span class="cx"> const std::unique_ptr<DragCaretController> m_dragCaretController;
</span><span class="lines">@@ -605,6 +612,7 @@
</span><span class="cx"> bool m_isEditable;
</span><span class="cx"> bool m_isPrerender;
</span><span class="cx"> ViewState::Flags m_viewState;
</span><ins>+ PageActivityState::Flags m_pageActivityState;
</ins><span class="cx">
</span><span class="cx"> LayoutMilestones m_requestedLayoutMilestones;
</span><span class="cx">
</span><span class="lines">@@ -655,6 +663,8 @@
</span><span class="cx"> SessionID m_sessionID;
</span><span class="cx">
</span><span class="cx"> bool m_isClosing;
</span><ins>+ bool m_shouldTabSuspend { false };
+ Timer m_tabSuspensionTimer;
</ins><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.h (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.h 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebCore/page/PageThrottler.h 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> PageThrottler(Page&);
</span><span class="cx">
</span><span class="cx"> void didReceiveUserInput() { m_userInputHysteresis.impulse(); }
</span><ins>+ PageActivityState::Flags activityState() { return m_activityState; }
</ins><span class="cx"> void pluginDidEvaluateWhileAudioIsPlaying() { m_audiblePluginHysteresis.impulse(); }
</span><span class="cx"> PageActivityAssertionToken mediaActivityToken();
</span><span class="cx"> PageActivityAssertionToken pageLoadActivityToken();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-12 Katlyn Graff <kgraff@apple.com>
+
+ Safari background tabs should be fully suspended where possible.
+ https://bugs.webkit.org/show_bug.cgi?id=150515
+
+ Reviewed by Ryosuke Niwa.
+
+ Added a runtime flag enabling tab suspension, default off.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::registerUserDefaultsIfNeeded):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2015-12-11 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Add a setting to allow the mock media capture devices to be enabled and disabled
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(MAC)
+ , shouldEnableTabSuspension(false)
+#endif
</ins><span class="cx"> , memoryCacheDisabled(false)
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , hasImageServices(false)
</span><span class="lines">@@ -118,6 +121,10 @@
</span><span class="cx"> encoder << bundleParameterData->dataReference();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ encoder << shouldEnableTabSuspension;
+#endif
+
</ins><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> encoder << notificationPermissions;
</span><span class="cx"> #endif
</span><span class="lines">@@ -257,6 +264,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ if (!decoder.decode(parameters.shouldEnableTabSuspension))
+ return false;
+#endif
+
</ins><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> if (!decoder.decode(parameters.notificationPermissions))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -142,6 +142,10 @@
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(COCOA)
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ bool shouldEnableTabSuspension;
+#endif
+
</ins><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> HashMap<String, bool> notificationPermissions;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -84,6 +84,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+NSString *WebKitTabSuspension = @"WebKitTabSuspension";
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> NSString *SchemeForCustomProtocolRegisteredNotificationName = @"WebKitSchemeForCustomProtocolRegisteredNotification";
</span><span class="lines">@@ -101,6 +105,10 @@
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitTabSuspension];
+#endif
+
</ins><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitNetworkCacheEnabledDefaultsKey];
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
</span><span class="lines">@@ -170,6 +178,10 @@
</span><span class="cx"> parameters.accessibilityEnhancedUserInterfaceEnabled = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ parameters.shouldEnableTabSuspension = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTabSuspension];
+#endif
+
</ins><span class="cx"> parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx"> parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><span class="cx"> parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@"LogMemoryJetsamDetails"];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (194005 => 194006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-12-12 07:44:07 UTC (rev 194005)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-12-12 09:26:42 UTC (rev 194006)
</span><span class="lines">@@ -145,6 +145,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> WebCore::FontCache::setFontWhitelist(parameters.fontWhitelist);
</span><ins>+ Page::setTabSuspensionEnabled(parameters.shouldEnableTabSuspension);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_compositingRenderServerPort = WTF::move(parameters.acceleratedCompositingPort);
</span></span></pre>
</div>
</div>
</body>
</html>