Changeset 197104 in webkit

Timestamp:

Feb 25, 2016, 5:49:08 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196971 - 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.

Location:

releases/WebKitGTK/webkit-2.12/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• page/Page.cpp (modified) (2 diffs)
• page/Page.h (modified) (3 diffs)
• page/Settings.cpp (modified) (2 diffs)
• page/Settings.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2016-02-22  Myles C. Maxfield  <mmaxfield@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp

@@ -2909 +2909 @@
 double Document::minimumTimerInterval() const
 {
-    Page* page = this->page();
+    auto* page = this->page();
     if (!page)
         return ScriptExecutionContext::minimumTimerInterval();
@@ -2926 +2926 @@
 double Document::timerAlignmentInterval(bool hasReachedMaxNestingLevel) const
 {
+    double alignmentInterval = ScriptExecutionContext::timerAlignmentInterval(hasReachedMaxNestingLevel);
+
     // Apply Document-level DOMTimer throttling only if timers have reached their maximum nesting level as the Page may still be visible.
     if (m_isTimerThrottlingEnabled && hasReachedMaxNestingLevel)
-        return DOMTimer::hiddenPageAlignmentInterval();
-
-    Page* page = this->page();
-    if (!page)
-        return ScriptExecutionContext::timerAlignmentInterval(hasReachedMaxNestingLevel);
-    return page->settings().domTimerAlignmentInterval();
+        alignmentInterval = std::max(alignmentInterval, DOMTimer::hiddenPageAlignmentInterval());
+
+    if (Page* page = this->page())
+        alignmentInterval = std::max(alignmentInterval, page->domTimerAlignmentInterval());
+
+    return alignmentInterval;
 }
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.cpp

@@ -207 +207 @@
 #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
     , m_timerThrottlingEnabled(false)
+    , m_timerAlignmentInterval(DOMTimer::defaultAlignmentInterval())
     , m_isEditable(false)
     , m_isPrerender(false)
@@ -1173 +1174 @@
 
     m_timerThrottlingEnabled = enabled;
-    m_settings->setDOMTimerAlignmentInterval(enabled ? DOMTimer::hiddenPageAlignmentInterval() : DOMTimer::defaultAlignmentInterval());
+    setDOMTimerAlignmentInterval(enabled ? DOMTimer::hiddenPageAlignmentInterval() : DOMTimer::defaultAlignmentInterval());
+}
+
+void Page::setDOMTimerAlignmentInterval(double alignmentInterval)
+{
+    m_timerAlignmentInterval = alignmentInterval;
     
     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {

releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Page.h

@@ -220 +220 @@
     BackForwardController& backForward() const { return *m_backForwardController; }
 
+    double domTimerAlignmentInterval() const { return m_timerAlignmentInterval; }
+
 #if ENABLE(VIEW_MODE_CSS_MEDIA)
     enum ViewMode {
@@ -525 +527 @@
     void hiddenPageDOMTimerThrottlingStateChanged();
     void setTimerThrottlingEnabled(bool);
+    void setDOMTimerAlignmentInterval(double);
+    void timerAlignmentIntervalTimerFired();
     bool canTabSuspend();
     void updateTabSuspensionState();
@@ -614 +618 @@
 
     bool m_timerThrottlingEnabled;
+    double m_timerAlignmentInterval;
 
     bool m_isEditable;

releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.cpp

@@ -181 +181 @@
     , m_layoutInterval(layoutScheduleThreshold)
     , m_minimumDOMTimerInterval(DOMTimer::defaultMinimumInterval())
-    , m_domTimerAlignmentInterval(DOMTimer::defaultAlignmentInterval())
 #if ENABLE(TEXT_AUTOSIZING)
     , m_textAutosizingFontScaleFactor(1)
@@ -486 +485 @@
 }
 
-void Settings::setDOMTimerAlignmentInterval(double alignmentInterval)
-{
-    m_domTimerAlignmentInterval = alignmentInterval;
-}
-
 void Settings::setLayoutInterval(std::chrono::milliseconds layoutInterval)
 {

releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h

@@ -159 +159 @@
     double minimumDOMTimerInterval() const { return m_minimumDOMTimerInterval; }
 
-    void setDOMTimerAlignmentInterval(double);
-    double domTimerAlignmentInterval() const { return m_domTimerAlignmentInterval; }
-
     WEBCORE_EXPORT void setLayoutInterval(std::chrono::milliseconds);
     std::chrono::milliseconds layoutInterval() const { return m_layoutInterval; }
@@ -304 +301 @@
     std::chrono::milliseconds m_layoutInterval;
     double m_minimumDOMTimerInterval;
-    double m_domTimerAlignmentInterval;
 
 #if ENABLE(TEXT_AUTOSIZING)