Changeset 166740 in webkit

Timestamp:

Apr 3, 2014 1:56:33 PM (10 years ago)

Author:

akling@apple.com

Message:

Stop throwing away the Document's StyleResolver on a timer.
<​https://webkit.org/b/131168>
<rdar://problem/15227045>

This was causing some unfortunate pauses when returning to idle pages
after a long-ish time. There's already a mechanism in place that will
throw these away if the system comes under memory pressure.

Reviewed by Sam Weinig.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleForElement):
(WebCore::StyleResolver::styleForKeyframe):
(WebCore::StyleResolver::pseudoStyleForElement):
(WebCore::StyleResolver::styleForPage):

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::didAccessStyleResolver): Deleted.
(WebCore::Document::styleResolverThrowawayTimerFired): Deleted.

• dom/Document.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (4 diffs)
• dom/Document.cpp (modified) (3 diffs)
• dom/Document.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-03  Andreas Kling  <akling@apple.com>
+
+        Stop throwing away the Document's StyleResolver on a timer.
+        <https://webkit.org/b/131168>
+        <rdar://problem/15227045>
+
+        This was causing some unfortunate pauses when returning to idle pages
+        after a long-ish time. There's already a mechanism in place that will
+        throw these away if the system comes under memory pressure.
+
+        Reviewed by Sam Weinig.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForElement):
+        (WebCore::StyleResolver::styleForKeyframe):
+        (WebCore::StyleResolver::pseudoStyleForElement):
+        (WebCore::StyleResolver::styleForPage):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::didAccessStyleResolver): Deleted.
+        (WebCore::Document::styleResolverThrowawayTimerFired): Deleted.
+        * dom/Document.h:
+
 2014-04-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -809 +809 @@
     state.clear(); // Clear out for the next resolve.
 
-    document().didAccessStyleResolver();
-
     // Now return the style.
     return state.takeStyle();
@@ -868 +866 @@
     }
 
-    document().didAccessStyleResolver();
-
     return state.takeStyle();
 }
@@ -983 +979 @@
     loadPendingResources();
 
-    document().didAccessStyleResolver();
-
     // Now return the style.
     return state.takeStyle();
@@ -1024 +1018 @@
     // Start loading resources referenced by this style.
     loadPendingResources();
-
-    document().didAccessStyleResolver();
 
     // Now return the style.

trunk/Source/WebCore/dom/Document.cpp

@@ -380 +380 @@
 uint64_t Document::s_globalTreeVersion = 0;
 
-static const double timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds = 30;
-
 #if ENABLE(IOS_TEXT_AUTOSIZING)
 void TextAutoSizingTraits::constructDeletedValue(TextAutoSizingKey& slot)
@@ -409 +407 @@
 #endif
     , m_referencingNodeCount(0)
-    , m_styleResolverThrowawayTimer(this, &Document::styleResolverThrowawayTimerFired, timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds)
     , m_didCalculateStyleResolver(false)
     , m_hasNodesWithPlaceholderStyle(false)
@@ -4486 +4483 @@
 }
 
-void Document::didAccessStyleResolver()
-{
-    m_styleResolverThrowawayTimer.restart();
-}
-
-void Document::styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>&)
-{
-    ASSERT(!m_inStyleRecalc);
-    clearStyleResolver();
-}
-
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
 // FIXME: Find a better place for this functionality.

trunk/Source/WebCore/dom/Document.h

@@ -561 +561 @@
     void scheduleOptimizedStyleSheetUpdate();
 
-    void didAccessStyleResolver();
-
     void evaluateMediaQueryList();
 
@@ -1356 +1354 @@
     void didAssociateFormControlsTimerFired(Timer<Document>&);
 
-    void styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>&);
-
     unsigned m_referencingNodeCount;
-
-    DeferrableOneShotTimer<Document> m_styleResolverThrowawayTimer;
 
     std::unique_ptr<StyleResolver> m_styleResolver;