Changeset 150013 in webkit

Timestamp:

May 13, 2013 8:05:18 AM (11 years ago)

Author:

akling@apple.com

Message:

Document: Use a DeferrableOneShotTimer to throw out StyleResolver when unused.
<​http://webkit.org/b/115929>

Reviewed by Anders Carlsson.

Nothing exciting here, just replacing a rickety-looking punting mechanism with a proper
DeferrableOneShotTimer. Note that the timeout changes from 60 to 30 seconds because DOST
works by punting a full interval on next timeout.

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::didAccessStyleResolver):
(WebCore::Document::styleResolverThrowawayTimerFired):

• dom/Document.h:

(Document):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-13  Andreas Kling  <akling@apple.com>
+
+        Document: Use a DeferrableOneShotTimer to throw out StyleResolver when unused.
+        <http://webkit.org/b/115929>
+
+        Reviewed by Anders Carlsson.
+
+        Nothing exciting here, just replacing a rickety-looking punting mechanism with a proper
+        DeferrableOneShotTimer. Note that the timeout changes from 60 to 30 seconds because DOST
+        works by punting a full interval on next timeout.
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::didAccessStyleResolver):
+        (WebCore::Document::styleResolverThrowawayTimerFired):
+        * dom/Document.h:
+        (Document):
+
 2013-05-13  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -414 +414 @@
 uint64_t Document::s_globalTreeVersion = 0;
 
+static const double timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds = 30;
+
 Document::Document(Frame* frame, const KURL& url, unsigned documentClasses)
     : ContainerNode(0, CreateDocument)
     , TreeScope(this)
-    , m_styleResolverThrowawayTimer(this, &Document::styleResolverThrowawayTimerFired)
-    , m_lastStyleResolverAccessTime(0)
+    , m_styleResolverThrowawayTimer(this, &Document::styleResolverThrowawayTimerFired, timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds)
     , m_activeParserCount(0)
     , m_contextFeatures(ContextFeatures::defaultSwitch())
@@ -4466 +4467 @@
 void Document::didAccessStyleResolver()
 {
-    static const int timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds = 60;
-    static const int holdOffTimeBeforeReschedulingTimerInSeconds = 5;
-
-    double currentTime = WTF::currentTime();
-
-    if (currentTime > m_lastStyleResolverAccessTime + holdOffTimeBeforeReschedulingTimerInSeconds) {
-        m_styleResolverThrowawayTimer.startOneShot(timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds);
-        m_lastStyleResolverAccessTime = currentTime;
-    }
-}
-
-void Document::styleResolverThrowawayTimerFired(Timer<Document>*)
+    m_styleResolverThrowawayTimer.restart();
+}
+
+void Document::styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>*)
 {
     ASSERT(!m_inStyleRecalc);

trunk/Source/WebCore/dom/Document.h

@@ -1296 +1296 @@
     void didAssociateFormControlsTimerFired(Timer<Document>*);
 
-    void styleResolverThrowawayTimerFired(Timer<Document>*);
-    Timer<Document> m_styleResolverThrowawayTimer;
-    double m_lastStyleResolverAccessTime;
+    void styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>*);
+    DeferrableOneShotTimer<Document> m_styleResolverThrowawayTimer;
 
     OwnPtr<StyleResolver> m_styleResolver;