Changeset 156912 in webkit

Timestamp:

Oct 4, 2013 1:46:57 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Inserting a JS generated keyframe animation shouldn't trigger a whole document style recalc
​https://bugs.webkit.org/show_bug.cgi?id=119479

Patch by Ralph Thomas <​ralpht@gmail.com> on 2013-10-04
Reviewed by Antti Koivisto.

Change CSSStyleSheet::didMutateRules to not invalidate all node's styles when inserting a
@-webkit-keyframes rule, and to instead insert the rule directly into the StyleResolver.

Test: animation/keyframes-dynamic.html: adds and removes keyframe rules using JavaScript and
validates that the correct elements are animated.

• css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::didMutateRules):
(WebCore::CSSStyleSheet::insertRule):

• css/CSSStyleSheet.h:

Location:

trunk

Files:

• LayoutTests/animations/keyframes-dynamic-expected.txt (added)
• LayoutTests/animations/keyframes-dynamic.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSheet.cpp (modified) (7 diffs)
• Source/WebCore/css/CSSStyleSheet.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-04  Ralph Thomas  <ralpht@gmail.com>
+
+        Inserting a JS generated keyframe animation shouldn't trigger a whole document style recalc
+        https://bugs.webkit.org/show_bug.cgi?id=119479
+
+        Reviewed by Antti Koivisto.
+
+        Change CSSStyleSheet::didMutateRules to not invalidate all node's styles when inserting a
+        @-webkit-keyframes rule, and to instead insert the rule directly into the StyleResolver.
+
+        Test: animation/keyframes-dynamic.html: adds and removes keyframe rules using JavaScript and
+        validates that the correct elements are animated.
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::didMutateRules):
+        (WebCore::CSSStyleSheet::insertRule):
+        * css/CSSStyleSheet.h:
+
 2013-10-04  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/css/CSSStyleSheet.cpp

@@ -38 +38 @@
 #include "SVGNames.h"
 #include "SecurityOrigin.h"
+#include "StyleResolver.h"
 #include "StyleRule.h"
 #include "StyleSheetContents.h"
+#include "WebKitCSSKeyframesRule.h"
 #include <wtf/text/StringBuilder.h>
 
@@ -158 +160 @@
 }
 
-void CSSStyleSheet::didMutateRules(RuleMutationType mutationType, WhetherContentsWereClonedForMutation contentsWereClonedForMutation)
+void CSSStyleSheet::didMutateRules(RuleMutationType mutationType, WhetherContentsWereClonedForMutation contentsWereClonedForMutation, StyleRuleKeyframes* insertedKeyframesRule)
 {
     ASSERT(m_contents->isMutable());
@@ -168 +170 @@
 
     if (mutationType == RuleInsertion && !contentsWereClonedForMutation && !owner->styleSheetCollection().activeStyleSheetsContains(this)) {
+        if (insertedKeyframesRule) {
+            if (StyleResolver* resolver = owner->styleResolverIfExists())
+                resolver->addKeyframeStyle(insertedKeyframesRule);
+            return;
+        }
         owner->scheduleOptimizedStyleSheetUpdate();
         return;
@@ -296 +303 @@
     }
 
-    RuleMutationScope mutationScope(this, RuleInsertion);
+    RuleMutationScope mutationScope(this, RuleInsertion, rule->type() == StyleRuleBase::Keyframes ? static_cast<StyleRuleKeyframes*>(rule.get()) : 0);
 
     bool success = m_contents->wrapperInsertRule(rule, index);
@@ -402 +409 @@
 }
 
-CSSStyleSheet::RuleMutationScope::RuleMutationScope(CSSStyleSheet* sheet, RuleMutationType mutationType)
+CSSStyleSheet::RuleMutationScope::RuleMutationScope(CSSStyleSheet* sheet, RuleMutationType mutationType, StyleRuleKeyframes* insertedKeyframesRule)
     : m_styleSheet(sheet)
     , m_mutationType(mutationType)
+    , m_insertedKeyframesRule(insertedKeyframesRule)
 {
     ASSERT(m_styleSheet);
@@ -414 +422 @@
     , m_mutationType(OtherMutation)
     , m_contentsWereClonedForMutation(ContentsWereNotClonedForMutation)
+    , m_insertedKeyframesRule(nullptr)
 {
     if (m_styleSheet)
@@ -422 +431 @@
 {
     if (m_styleSheet)
-        m_styleSheet->didMutateRules(m_mutationType, m_contentsWereClonedForMutation);
-}
-
-}
+        m_styleSheet->didMutateRules(m_mutationType, m_contentsWereClonedForMutation, m_insertedKeyframesRule);
+}
+
+}

trunk/Source/WebCore/css/CSSStyleSheet.h

@@ -41 +41 @@
 class MediaQuerySet;
 class SecurityOrigin;
+class StyleRuleKeyframes;
 class StyleSheetContents;
 
@@ -92 +93 @@
         WTF_MAKE_NONCOPYABLE(RuleMutationScope);
     public:
-        RuleMutationScope(CSSStyleSheet*, RuleMutationType = OtherMutation);
+        RuleMutationScope(CSSStyleSheet*, RuleMutationType = OtherMutation, StyleRuleKeyframes* insertedKeyframesRule = nullptr);
         RuleMutationScope(CSSRule*);
         ~RuleMutationScope();
@@ -100 +101 @@
         RuleMutationType m_mutationType;
         WhetherContentsWereClonedForMutation m_contentsWereClonedForMutation;
+        StyleRuleKeyframes* m_insertedKeyframesRule;
     };
 
     WhetherContentsWereClonedForMutation willMutateRules();
-    void didMutateRules(RuleMutationType, WhetherContentsWereClonedForMutation);
+    void didMutateRules(RuleMutationType, WhetherContentsWereClonedForMutation, StyleRuleKeyframes* insertedKeyframesRule);
     void didMutateRuleFromCSSStyleDeclaration();
     void didMutate();