<!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>[197104] releases/WebKitGTK/webkit-2.12/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197104">197104</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 05:49:08 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196971">r196971</a> - Some timer alignment cleanup.
https://bugs.webkit.org/show_bug.cgi?id=154559
Reviewed by Chris Dumez.
Document shouldn't override Page's timer alignment policy with a lower alignment,
and m_domTimerAlignmentInterval isn't really a Settings, it's just the current state
for the page.
* dom/Document.cpp:
(WebCore::Document::timerAlignmentInterval):
- take the max of the possible intervals.
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::setTimerThrottlingEnabled):
(WebCore::Page::setDOMTimerAlignmentInterval):
- moved here from Settings.
* page/Page.h:
(WebCore::Page::domTimerAlignmentInterval):
- moved here from Settings.
* page/Settings.cpp:
(WebCore::Settings::setDOMTimerAlignmentInterval): Deleted.
- moved to Page.
* page/Settings.h:
(WebCore::Settings::domTimerAlignmentInterval): Deleted.
- moved to Page.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomDocumentcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepagePagecpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepagePageh">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepageSettingscpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepageSettingsh">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197103 => 197104)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-25 13:40:58 UTC (rev 197103)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-25 13:49:08 UTC (rev 197104)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-02-22 Gavin Barraclough <barraclough@apple.com>
+
+ Some timer alignment cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=154559
+
+ Reviewed by Chris Dumez.
+
+ Document shouldn't override Page's timer alignment policy with a lower alignment,
+ and m_domTimerAlignmentInterval isn't really a Settings, it's just the current state
+ for the page.
+
+ * dom/Document.cpp:
+ (WebCore::Document::timerAlignmentInterval):
+ - take the max of the possible intervals.
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::setTimerThrottlingEnabled):
+ (WebCore::Page::setDOMTimerAlignmentInterval):
+ - moved here from Settings.
+ * page/Page.h:
+ (WebCore::Page::domTimerAlignmentInterval):
+ - moved here from Settings.
+ * page/Settings.cpp:
+ (WebCore::Settings::setDOMTimerAlignmentInterval): Deleted.
+ - moved to Page.
+ * page/Settings.h:
+ (WebCore::Settings::domTimerAlignmentInterval): Deleted.
+ - moved to Page.
+
</ins><span class="cx"> 2016-02-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Font features specified in @font-face blocks don't apply to local() families
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp (197103 => 197104)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp 2016-02-25 13:40:58 UTC (rev 197103)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp 2016-02-25 13:49:08 UTC (rev 197104)
</span><span class="lines">@@ -2908,7 +2908,7 @@
</span><span class="cx">
</span><span class="cx"> double Document::minimumTimerInterval() const
</span><span class="cx"> {
</span><del>- Page* page = this->page();
</del><ins>+ auto* page = this->page();
</ins><span class="cx"> if (!page)
</span><span class="cx"> return ScriptExecutionContext::minimumTimerInterval();
</span><span class="cx"> return page->settings().minimumDOMTimerInterval();
</span><span class="lines">@@ -2925,14 +2925,16 @@
</span><span class="cx">
</span><span class="cx"> double Document::timerAlignmentInterval(bool hasReachedMaxNestingLevel) const
</span><span class="cx"> {
</span><ins>+ double alignmentInterval = ScriptExecutionContext::timerAlignmentInterval(hasReachedMaxNestingLevel);
+
</ins><span class="cx"> // Apply Document-level DOMTimer throttling only if timers have reached their maximum nesting level as the Page may still be visible.
</span><span class="cx"> if (m_isTimerThrottlingEnabled && hasReachedMaxNestingLevel)
</span><del>- return DOMTimer::hiddenPageAlignmentInterval();
</del><ins>+ alignmentInterval = std::max(alignmentInterval, DOMTimer::hiddenPageAlignmentInterval());
</ins><span class="cx">
</span><del>- Page* page = this->page();
- if (!page)
- return ScriptExecutionContext::timerAlignmentInterval(hasReachedMaxNestingLevel);
- return page->settings().domTimerAlignmentInterval();
</del><ins>+ if (Page* page = this->page())
+ alignmentInterval = std::max(alignmentInterval, page->domTimerAlignmentInterval());
+
+ return alignmentInterval;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventTarget* Document::errorEventTarget()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.cpp (197103 => 197104)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.cpp 2016-02-25 13:40:58 UTC (rev 197103)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.cpp 2016-02-25 13:49:08 UTC (rev 197104)
</span><span class="lines">@@ -206,6 +206,7 @@
</span><span class="cx"> , m_viewMode(ViewModeWindowed)
</span><span class="cx"> #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx"> , m_timerThrottlingEnabled(false)
</span><ins>+ , m_timerAlignmentInterval(DOMTimer::defaultAlignmentInterval())
</ins><span class="cx"> , m_isEditable(false)
</span><span class="cx"> , m_isPrerender(false)
</span><span class="cx"> , m_viewState(PageInitialViewState)
</span><span class="lines">@@ -1172,7 +1173,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_timerThrottlingEnabled = enabled;
</span><del>- m_settings->setDOMTimerAlignmentInterval(enabled ? DOMTimer::hiddenPageAlignmentInterval() : DOMTimer::defaultAlignmentInterval());
</del><ins>+ setDOMTimerAlignmentInterval(enabled ? DOMTimer::hiddenPageAlignmentInterval() : DOMTimer::defaultAlignmentInterval());
+}
+
+void Page::setDOMTimerAlignmentInterval(double alignmentInterval)
+{
+ m_timerAlignmentInterval = alignmentInterval;
</ins><span class="cx">
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (frame->document())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.h (197103 => 197104)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.h 2016-02-25 13:40:58 UTC (rev 197103)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.h 2016-02-25 13:49:08 UTC (rev 197104)
</span><span class="lines">@@ -219,6 +219,8 @@
</span><span class="cx"> ProgressTracker& progress() const { return *m_progress; }
</span><span class="cx"> BackForwardController& backForward() const { return *m_backForwardController; }
</span><span class="cx">
</span><ins>+ double domTimerAlignmentInterval() const { return m_timerAlignmentInterval; }
+
</ins><span class="cx"> #if ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx"> enum ViewMode {
</span><span class="cx"> ViewModeInvalid,
</span><span class="lines">@@ -524,6 +526,8 @@
</span><span class="cx">
</span><span class="cx"> void hiddenPageDOMTimerThrottlingStateChanged();
</span><span class="cx"> void setTimerThrottlingEnabled(bool);
</span><ins>+ void setDOMTimerAlignmentInterval(double);
+ void timerAlignmentIntervalTimerFired();
</ins><span class="cx"> bool canTabSuspend();
</span><span class="cx"> void updateTabSuspensionState();
</span><span class="cx"> void tabSuspensionTimerFired();
</span><span class="lines">@@ -613,6 +617,7 @@
</span><span class="cx"> #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx">
</span><span class="cx"> bool m_timerThrottlingEnabled;
</span><ins>+ double m_timerAlignmentInterval;
</ins><span class="cx">
</span><span class="cx"> bool m_isEditable;
</span><span class="cx"> bool m_isPrerender;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.cpp (197103 => 197104)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.cpp 2016-02-25 13:40:58 UTC (rev 197103)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.cpp 2016-02-25 13:49:08 UTC (rev 197104)
</span><span class="lines">@@ -180,7 +180,6 @@
</span><span class="cx"> , m_storageBlockingPolicy(SecurityOrigin::AllowAllStorage)
</span><span class="cx"> , m_layoutInterval(layoutScheduleThreshold)
</span><span class="cx"> , m_minimumDOMTimerInterval(DOMTimer::defaultMinimumInterval())
</span><del>- , m_domTimerAlignmentInterval(DOMTimer::defaultAlignmentInterval())
</del><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx"> , m_textAutosizingFontScaleFactor(1)
</span><span class="cx"> #if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
</span><span class="lines">@@ -485,11 +484,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Settings::setDOMTimerAlignmentInterval(double alignmentInterval)
-{
- m_domTimerAlignmentInterval = alignmentInterval;
-}
-
</del><span class="cx"> void Settings::setLayoutInterval(std::chrono::milliseconds layoutInterval)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: It seems weird that this function may disregard the specified layout interval.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h (197103 => 197104)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h 2016-02-25 13:40:58 UTC (rev 197103)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h 2016-02-25 13:49:08 UTC (rev 197104)
</span><span class="lines">@@ -158,9 +158,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setMinimumDOMTimerInterval(double); // Initialized to DOMTimer::defaultMinimumInterval().
</span><span class="cx"> double minimumDOMTimerInterval() const { return m_minimumDOMTimerInterval; }
</span><span class="cx">
</span><del>- void setDOMTimerAlignmentInterval(double);
- double domTimerAlignmentInterval() const { return m_domTimerAlignmentInterval; }
-
</del><span class="cx"> WEBCORE_EXPORT void setLayoutInterval(std::chrono::milliseconds);
</span><span class="cx"> std::chrono::milliseconds layoutInterval() const { return m_layoutInterval; }
</span><span class="cx">
</span><span class="lines">@@ -303,7 +300,6 @@
</span><span class="cx"> SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy;
</span><span class="cx"> std::chrono::milliseconds m_layoutInterval;
</span><span class="cx"> double m_minimumDOMTimerInterval;
</span><del>- double m_domTimerAlignmentInterval;
</del><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx"> float m_textAutosizingFontScaleFactor;
</span></span></pre>
</div>
</div>
</body>
</html>