<!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>[181753] 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/181753">181753</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-19 12:22:22 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up DOMTimer related settings
https://bugs.webkit.org/show_bug.cgi?id=142837
Reviewed by Darin Adler.
Source/WebCore:
Clean up DOMTimer related settings:
- Make default minimum timer interval 4ms instead of 10ms as all ports
were setting it to 4ms and the specifications says 4ms.
- Get rid of setters for default DOMTimer interval values as they are
not set anymore.
- Move default DOMTimer interval values from Settings to DOMTimer as
those are global (not per-page) and not really settings.
- Stop using abbreviations in the names (e.g. min -> minimum).
- Move DOMTimer settings members from Page to Settings. There is no
reason for those to be stored on the Page. The getters were private
so call-sites had to go via Settings anyway. Also, call-sites already
had to do a null check on the page to get the settings. It seems
unfortunate for the settings to do another null-check on the page for
retrieving the setting value from the page.
- Inline the DOMTimer settings getters as these are trivial.
* dom/Document.cpp:
(WebCore::Document::minimumTimerInterval):
(WebCore::Document::timerAlignmentInterval):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::minimumTimerInterval):
(WebCore::ScriptExecutionContext::timerAlignmentInterval):
* page/DOMTimer.h:
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::setTimerThrottlingEnabled):
(WebCore::Page::setMinimumTimerInterval): Deleted.
(WebCore::Page::minimumTimerInterval): Deleted.
* page/Page.h:
(WebCore::Page::timerAlignmentInterval): Deleted.
* page/Settings.cpp:
(WebCore::Settings::Settings):
(WebCore::Settings::setMinimumDOMTimerInterval):
(WebCore::Settings::setDOMTimerAlignmentInterval):
(WebCore::Settings::setHiddenPageDOMTimerAlignmentInterval): Deleted.
(WebCore::Settings::hiddenPageDOMTimerAlignmentInterval): Deleted.
(WebCore::Settings::setDefaultMinDOMTimerInterval): Deleted.
(WebCore::Settings::defaultMinDOMTimerInterval): Deleted.
(WebCore::Settings::setMinDOMTimerInterval): Deleted.
(WebCore::Settings::minDOMTimerInterval): Deleted.
(WebCore::Settings::setDefaultDOMTimerAlignmentInterval): Deleted.
(WebCore::Settings::defaultDOMTimerAlignmentInterval): Deleted.
(WebCore::Settings::domTimerAlignmentInterval): Deleted.
* page/Settings.h:
(WebCore::Settings::minimumDOMTimerInterval):
(WebCore::Settings::domTimerAlignmentInterval):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setMinimumTimerInterval):
Source/WebKit/mac:
Stop setting the DOMTimers' default minimum interval to 4ms as this
is now the default.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
Source/WebKit/win:
Stop setting the DOMTimers' default minimum interval to 4ms as this
is now the default.
* WebView.cpp:
(WebView::initWithFrame):
(WebView::defaultMinimumTimerInterval):
Source/WebKit2:
Stop setting the DOMTimers' default minimum interval to 4ms as this
is now the default.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):</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="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimerh">trunk/Source/WebCore/page/DOMTimer.h</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="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/ChangeLog 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2015-03-19 Chris Dumez <cdumez@apple.com>
+
+ Clean up DOMTimer related settings
+ https://bugs.webkit.org/show_bug.cgi?id=142837
+
+ Reviewed by Darin Adler.
+
+ Clean up DOMTimer related settings:
+ - Make default minimum timer interval 4ms instead of 10ms as all ports
+ were setting it to 4ms and the specifications says 4ms.
+ - Get rid of setters for default DOMTimer interval values as they are
+ not set anymore.
+ - Move default DOMTimer interval values from Settings to DOMTimer as
+ those are global (not per-page) and not really settings.
+ - Stop using abbreviations in the names (e.g. min -> minimum).
+ - Move DOMTimer settings members from Page to Settings. There is no
+ reason for those to be stored on the Page. The getters were private
+ so call-sites had to go via Settings anyway. Also, call-sites already
+ had to do a null check on the page to get the settings. It seems
+ unfortunate for the settings to do another null-check on the page for
+ retrieving the setting value from the page.
+ - Inline the DOMTimer settings getters as these are trivial.
+
+ * dom/Document.cpp:
+ (WebCore::Document::minimumTimerInterval):
+ (WebCore::Document::timerAlignmentInterval):
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::minimumTimerInterval):
+ (WebCore::ScriptExecutionContext::timerAlignmentInterval):
+ * page/DOMTimer.h:
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::setTimerThrottlingEnabled):
+ (WebCore::Page::setMinimumTimerInterval): Deleted.
+ (WebCore::Page::minimumTimerInterval): Deleted.
+ * page/Page.h:
+ (WebCore::Page::timerAlignmentInterval): Deleted.
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setMinimumDOMTimerInterval):
+ (WebCore::Settings::setDOMTimerAlignmentInterval):
+ (WebCore::Settings::setHiddenPageDOMTimerAlignmentInterval): Deleted.
+ (WebCore::Settings::hiddenPageDOMTimerAlignmentInterval): Deleted.
+ (WebCore::Settings::setDefaultMinDOMTimerInterval): Deleted.
+ (WebCore::Settings::defaultMinDOMTimerInterval): Deleted.
+ (WebCore::Settings::setMinDOMTimerInterval): Deleted.
+ (WebCore::Settings::minDOMTimerInterval): Deleted.
+ (WebCore::Settings::setDefaultDOMTimerAlignmentInterval): Deleted.
+ (WebCore::Settings::defaultDOMTimerAlignmentInterval): Deleted.
+ (WebCore::Settings::domTimerAlignmentInterval): Deleted.
+ * page/Settings.h:
+ (WebCore::Settings::minimumDOMTimerInterval):
+ (WebCore::Settings::domTimerAlignmentInterval):
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setMinimumTimerInterval):
+
</ins><span class="cx"> 2015-03-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Scrollbars look bad with GTK+ 3.16
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -2728,18 +2728,18 @@
</span><span class="cx">
</span><span class="cx"> double Document::minimumTimerInterval() const
</span><span class="cx"> {
</span><del>- Page* p = page();
- if (!p)
</del><ins>+ Page* page = this->page();
+ if (!page)
</ins><span class="cx"> return ScriptExecutionContext::minimumTimerInterval();
</span><del>- return p->settings().minDOMTimerInterval();
</del><ins>+ return page->settings().minimumDOMTimerInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double Document::timerAlignmentInterval() const
</span><span class="cx"> {
</span><del>- Page* p = page();
- if (!p)
</del><ins>+ Page* page = this->page();
+ if (!page)
</ins><span class="cx"> return ScriptExecutionContext::timerAlignmentInterval();
</span><del>- return p->settings().domTimerAlignmentInterval();
</del><ins>+ return page->settings().domTimerAlignmentInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventTarget* Document::errorEventTarget()
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> // workers, we will have to override it in the appropriate
</span><span class="cx"> // subclass, and provide a way to enumerate a Document's dedicated
</span><span class="cx"> // workers so we can update them all.
</span><del>- return Settings::defaultMinDOMTimerInterval();
</del><ins>+ return DOMTimer::defaultMinimumInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::didChangeTimerAlignmentInterval()
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx">
</span><span class="cx"> double ScriptExecutionContext::timerAlignmentInterval() const
</span><span class="cx"> {
</span><del>- return Settings::defaultDOMTimerAlignmentInterval();
</del><ins>+ return DOMTimer::defaultAlignmentInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::VM& ScriptExecutionContext::vm()
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.h (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.h 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/page/DOMTimer.h 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -48,6 +48,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~DOMTimer();
</span><span class="cx">
</span><ins>+ static double defaultMinimumInterval() { return 0.004; } // 4 milliseconds.
+ static double defaultAlignmentInterval() { return 0; }
+ static double hiddenPageAlignmentInterval() { return 1.0; } // 1 second.
+
</ins><span class="cx"> // Creates a new timer owned by specified ScriptExecutionContext, starts it
</span><span class="cx"> // and returns its Id.
</span><span class="cx"> static int install(ScriptExecutionContext&, std::unique_ptr<ScheduledAction>, int timeout, bool singleShot);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/page/Page.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -187,9 +187,7 @@
</span><span class="cx"> #if ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx"> , m_viewMode(ViewModeWindowed)
</span><span class="cx"> #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
</span><del>- , m_minimumTimerInterval(Settings::defaultMinDOMTimerInterval())
</del><span class="cx"> , m_timerThrottlingEnabled(false)
</span><del>- , m_timerAlignmentInterval(Settings::defaultDOMTimerAlignmentInterval())
</del><span class="cx"> , m_isEditable(false)
</span><span class="cx"> , m_isPrerender(false)
</span><span class="cx"> , m_viewState(PageInitialViewState)
</span><span class="lines">@@ -1128,21 +1126,6 @@
</span><span class="cx"> frame->loader().tellClientAboutPastMemoryCacheLoads();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setMinimumTimerInterval(double minimumTimerInterval)
-{
- double oldTimerInterval = m_minimumTimerInterval;
- m_minimumTimerInterval = minimumTimerInterval;
- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNextWithWrap(false)) {
- if (frame->document())
- frame->document()->adjustMinimumTimerInterval(oldTimerInterval);
- }
-}
-
-double Page::minimumTimerInterval() const
-{
- return m_minimumTimerInterval;
-}
-
</del><span class="cx"> void Page::hiddenPageDOMTimerThrottlingStateChanged()
</span><span class="cx"> {
</span><span class="cx"> setTimerThrottlingEnabled(m_viewState & ViewState::IsVisuallyIdle);
</span><span class="lines">@@ -1159,9 +1142,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_timerThrottlingEnabled = enabled;
</span><del>- m_timerAlignmentInterval = enabled ? Settings::hiddenPageDOMTimerAlignmentInterval() : Settings::defaultDOMTimerAlignmentInterval();
</del><ins>+ m_settings->setDOMTimerAlignmentInterval(enabled ? DOMTimer::hiddenPageAlignmentInterval() : DOMTimer::defaultAlignmentInterval());
</ins><span class="cx">
</span><del>- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNextWithWrap(false)) {
</del><ins>+ for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</ins><span class="cx"> if (frame->document())
</span><span class="cx"> frame->document()->didChangeTimerAlignmentInterval();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/page/Page.h 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -454,11 +454,6 @@
</span><span class="cx">
</span><span class="cx"> MediaCanStartListener* takeAnyMediaCanStartListener();
</span><span class="cx">
</span><del>- void setMinimumTimerInterval(double);
- double minimumTimerInterval() const;
-
- double timerAlignmentInterval() const { return m_timerAlignmentInterval; }
-
</del><span class="cx"> Vector<Ref<PluginViewBase>> pluginViews();
</span><span class="cx">
</span><span class="cx"> void hiddenPageDOMTimerThrottlingStateChanged();
</span><span class="lines">@@ -546,10 +541,7 @@
</span><span class="cx"> ViewMode m_viewMode;
</span><span class="cx"> #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx">
</span><del>- double m_minimumTimerInterval;
-
</del><span class="cx"> bool m_timerThrottlingEnabled;
</span><del>- double m_timerAlignmentInterval;
</del><span class="cx">
</span><span class="cx"> bool m_isEditable;
</span><span class="cx"> bool m_isPrerender;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -69,10 +69,6 @@
</span><span class="cx"> page->setNeedsRecalcStyleInAllFrames();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double Settings::gDefaultMinDOMTimerInterval = 0.010; // 10 milliseconds
-double Settings::gDefaultDOMTimerAlignmentInterval = 0;
-double Settings::gHiddenPageDOMTimerAlignmentInterval = 1.0;
-
</del><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> bool Settings::gAVFoundationEnabled = false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -163,6 +159,8 @@
</span><span class="cx"> , m_fontGenericFamilies(std::make_unique<FontGenericFamilies>())
</span><span class="cx"> , m_storageBlockingPolicy(SecurityOrigin::AllowAllStorage)
</span><span class="cx"> , m_layoutInterval(layoutScheduleThreshold)
</span><ins>+ , m_minimumDOMTimerInterval(DOMTimer::defaultMinimumInterval())
+ , m_domTimerAlignmentInterval(DOMTimer::defaultAlignmentInterval())
</ins><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">@@ -215,16 +213,6 @@
</span><span class="cx">
</span><span class="cx"> SETTINGS_SETTER_BODIES
</span><span class="cx">
</span><del>-void Settings::setHiddenPageDOMTimerAlignmentInterval(double hiddenPageDOMTimerAlignmentinterval)
-{
- gHiddenPageDOMTimerAlignmentInterval = hiddenPageDOMTimerAlignmentinterval;
-}
-
-double Settings::hiddenPageDOMTimerAlignmentInterval()
-{
- return gHiddenPageDOMTimerAlignmentInterval;
-}
-
</del><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void Settings::initializeDefaultFontFamilies()
</span><span class="cx"> {
</span><span class="lines">@@ -450,46 +438,25 @@
</span><span class="cx"> m_needsAdobeFrameReloadingQuirk = shouldNotReloadIFramesForUnchangedSRC;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Settings::setDefaultMinDOMTimerInterval(double interval)
</del><ins>+void Settings::setMinimumDOMTimerInterval(double interval)
</ins><span class="cx"> {
</span><del>- gDefaultMinDOMTimerInterval = interval;
-}
</del><ins>+ double oldTimerInterval = m_minimumDOMTimerInterval;
+ m_minimumDOMTimerInterval = interval;
</ins><span class="cx">
</span><del>-double Settings::defaultMinDOMTimerInterval()
-{
- return gDefaultMinDOMTimerInterval;
-}
-
-void Settings::setMinDOMTimerInterval(double interval)
-{
- if (m_page)
- m_page->setMinimumTimerInterval(interval);
-}
-
-double Settings::minDOMTimerInterval()
-{
</del><span class="cx"> if (!m_page)
</span><del>- return 0;
- return m_page->minimumTimerInterval();
-}
</del><ins>+ return;
</ins><span class="cx">
</span><del>-void Settings::setDefaultDOMTimerAlignmentInterval(double interval)
-{
- gDefaultDOMTimerAlignmentInterval = interval;
</del><ins>+ for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (frame->document())
+ frame->document()->adjustMinimumTimerInterval(oldTimerInterval);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-double Settings::defaultDOMTimerAlignmentInterval()
</del><ins>+void Settings::setDOMTimerAlignmentInterval(double alignmentInterval)
</ins><span class="cx"> {
</span><del>- return gDefaultDOMTimerAlignmentInterval;
</del><ins>+ m_domTimerAlignmentInterval = alignmentInterval;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-double Settings::domTimerAlignmentInterval() const
-{
- if (!m_page)
- return 0;
- return m_page->timerAlignmentInterval();
-}
-
</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="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/page/Settings.h 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -163,20 +163,12 @@
</span><span class="cx"> WEBCORE_EXPORT void setNeedsAdobeFrameReloadingQuirk(bool);
</span><span class="cx"> bool needsAcrobatFrameReloadingQuirk() const { return m_needsAdobeFrameReloadingQuirk; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds.
- WEBCORE_EXPORT static double defaultMinDOMTimerInterval();
-
- static void setHiddenPageDOMTimerAlignmentInterval(double); // Interval specified in seconds.
- static double hiddenPageDOMTimerAlignmentInterval();
</del><ins>+ WEBCORE_EXPORT void setMinimumDOMTimerInterval(double); // Initialized to DOMTimer::defaultMinimumInterval().
+ WEBCORE_EXPORT double minimumDOMTimerInterval() const { return m_minimumDOMTimerInterval; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT void setMinDOMTimerInterval(double); // Per-page; initialized to default value.
- WEBCORE_EXPORT double minDOMTimerInterval();
</del><ins>+ void setDOMTimerAlignmentInterval(double);
+ double domTimerAlignmentInterval() const { return m_domTimerAlignmentInterval; }
</ins><span class="cx">
</span><del>- static void setDefaultDOMTimerAlignmentInterval(double);
- WEBCORE_EXPORT static double defaultDOMTimerAlignmentInterval();
-
- double domTimerAlignmentInterval() const;
-
</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">@@ -283,6 +275,9 @@
</span><span class="cx"> const std::unique_ptr<FontGenericFamilies> m_fontGenericFamilies;
</span><span class="cx"> SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy;
</span><span class="cx"> std::chrono::milliseconds m_layoutInterval;
</span><ins>+ double m_minimumDOMTimerInterval;
+ double m_domTimerAlignmentInterval;
+
</ins><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx"> float m_textAutosizingFontScaleFactor;
</span><span class="cx"> IntSize m_textAutosizingWindowSizeOverride;
</span><span class="lines">@@ -320,9 +315,6 @@
</span><span class="cx"> bool m_hiddenPageCSSAnimationSuspensionEnabled : 1;
</span><span class="cx"> bool m_fontFallbackPrefersPictographs : 1;
</span><span class="cx">
</span><del>- static double gDefaultMinDOMTimerInterval;
- static double gDefaultDOMTimerAlignmentInterval;
-
</del><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> WEBCORE_EXPORT static bool gAVFoundationEnabled;
</span><span class="cx"> #endif
</span><span class="lines">@@ -349,8 +341,6 @@
</span><span class="cx"> String m_mediaKeysStorageDirectory;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- static double gHiddenPageDOMTimerAlignmentInterval;
-
</del><span class="cx"> static bool gLowPowerVideoAudioBufferSizeEnabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> , m_originalMockScrollbarsEnabled(settings.mockScrollbarsEnabled())
</span><span class="cx"> , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::sharedFeatures().langAttributeAwareFormControlUIEnabled())
</span><span class="cx"> , m_imagesEnabled(settings.areImagesEnabled())
</span><del>- , m_minimumTimerInterval(settings.minDOMTimerInterval())
</del><ins>+ , m_minimumTimerInterval(settings.minimumDOMTimerInterval())
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> , m_shouldDisplaySubtitles(settings.shouldDisplaySubtitles())
</span><span class="cx"> , m_shouldDisplayCaptions(settings.shouldDisplayCaptions())
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> settings.setCanvasUsesAcceleratedDrawing(m_originalCanvasUsesAcceleratedDrawing);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
</span><span class="cx"> settings.setImagesEnabled(m_imagesEnabled);
</span><del>- settings.setMinDOMTimerInterval(m_minimumTimerInterval);
</del><ins>+ settings.setMinimumDOMTimerInterval(m_minimumTimerInterval);
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> settings.setShouldDisplaySubtitles(m_shouldDisplaySubtitles);
</span><span class="cx"> settings.setShouldDisplayCaptions(m_shouldDisplayCaptions);
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> void InternalSettings::setMinimumTimerInterval(double intervalInSeconds, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> InternalSettingsGuardForSettings();
</span><del>- settings()->setMinDOMTimerInterval(intervalInSeconds);
</del><ins>+ settings()->setMinimumDOMTimerInterval(intervalInSeconds);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-19 Chris Dumez <cdumez@apple.com>
+
+ Clean up DOMTimer related settings
+ https://bugs.webkit.org/show_bug.cgi?id=142837
+
+ Reviewed by Darin Adler.
+
+ Stop setting the DOMTimers' default minimum interval to 4ms as this
+ is now the default.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
</ins><span class="cx"> 2015-03-17 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> Ignore some deprecation warnings
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -926,8 +926,6 @@
</span><span class="cx"> WebKitInitializeGamepadProviderIfNecessary();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Settings::setDefaultMinDOMTimerInterval(0.004);
-
</del><span class="cx"> Settings::setShouldRespectPriorityInCSSAttributeSetters(shouldRespectPriorityInCSSAttributeSetters());
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebKit/win/ChangeLog 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-19 Chris Dumez <cdumez@apple.com>
+
+ Clean up DOMTimer related settings
+ https://bugs.webkit.org/show_bug.cgi?id=142837
+
+ Reviewed by Darin Adler.
+
+ Stop setting the DOMTimers' default minimum interval to 4ms as this
+ is now the default.
+
+ * WebView.cpp:
+ (WebView::initWithFrame):
+ (WebView::defaultMinimumTimerInterval):
+
</ins><span class="cx"> 2015-03-16 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow clients to selectively disable plug-ins
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -2788,7 +2788,6 @@
</span><span class="cx">
</span><span class="cx"> WebKitInitializeWebDatabasesIfNecessary();
</span><span class="cx"> WebKitSetApplicationCachePathIfNecessary();
</span><del>- Settings::setDefaultMinDOMTimerInterval(0.004);
</del><span class="cx">
</span><span class="cx"> didOneTimeInitialization = true;
</span><span class="cx"> }
</span><span class="lines">@@ -6823,13 +6822,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!interval)
</span><span class="cx"> return E_POINTER;
</span><del>- *interval = Settings::defaultMinDOMTimerInterval();
</del><ins>+ *interval = DOMTimer::defaultMinimumInterval();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::setMinimumTimerInterval(double interval)
</span><span class="cx"> {
</span><del>- page()->settings().setMinDOMTimerInterval(interval);
</del><ins>+ page()->settings().setMinimumDOMTimerInterval(interval);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-03-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Clean up DOMTimer related settings
+ https://bugs.webkit.org/show_bug.cgi?id=142837
+
+ Reviewed by Darin Adler.
+
+ Stop setting the DOMTimers' default minimum interval to 4ms as this
+ is now the default.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+
+2015-03-19 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> The network cache should ignore "cache-control: no-cache, must-revalidate" on history navigation
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142831
</span><span class="cx"> <rdar://problem/20209957>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (181752 => 181753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-19 18:13:36 UTC (rev 181752)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-19 19:22:22 UTC (rev 181753)
</span><span class="lines">@@ -343,9 +343,6 @@
</span><span class="cx"> , m_shouldDispatchFakeMouseMoveEvents(true)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageID);
</span><del>- // FIXME: This is a non-ideal location for this Setting and
- // 4ms should be adopted project-wide now, https://bugs.webkit.org/show_bug.cgi?id=61214
- Settings::setDefaultMinDOMTimerInterval(0.004);
</del><span class="cx">
</span><span class="cx"> m_pageGroup = WebProcess::singleton().webPageGroup(parameters.pageGroupData);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>