Changeset 141280 in webkit

Timestamp:

Jan 30, 2013 9:55:48 AM (11 years ago)

Author:

fmalita@chromium.org

Message:

Do not restart the matched properties cache timer if active
​https://bugs.webkit.org/show_bug.cgi?id=108345

Reviewed by Andreas Kling.

StyleResolver::addToMatchedPropertiesCache() keeps resetting the timer as more than
matchedDeclarationCacheAdditionsBetweenSweeps entries are added. When armed, we should let
the timer expire at its scheduled time - otherwise it may never get a chance to fire if
entries keep getting added.

No new tests. This is a long lived timer (1min) which makes testing impractical.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::addToMatchedPropertiesCache):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Florin Malita  <fmalita@chromium.org>
+
+        Do not restart the matched properties cache timer if active
+        https://bugs.webkit.org/show_bug.cgi?id=108345
+
+        Reviewed by Andreas Kling.
+
+        StyleResolver::addToMatchedPropertiesCache() keeps resetting the timer as more than
+        matchedDeclarationCacheAdditionsBetweenSweeps entries are added. When armed, we should let
+        the timer expire at its scheduled time - otherwise it may never get a chance to fire if
+        entries keep getting added.
+
+        No new tests. This is a long lived timer (1min) which makes testing impractical.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::addToMatchedPropertiesCache):
+
 2013-01-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2473 +2473 @@
 {
     static const unsigned matchedDeclarationCacheAdditionsBetweenSweeps = 100;
-    if (++m_matchedPropertiesCacheAdditionsSinceLastSweep >= matchedDeclarationCacheAdditionsBetweenSweeps) {
+    if (++m_matchedPropertiesCacheAdditionsSinceLastSweep >= matchedDeclarationCacheAdditionsBetweenSweeps
+        && !m_matchedPropertiesCacheSweepTimer.isActive()) {
         static const unsigned matchedDeclarationCacheSweepTimeInSeconds = 60;
         m_matchedPropertiesCacheSweepTimer.startOneShot(matchedDeclarationCacheSweepTimeInSeconds);