Changeset 198284 in webkit

Timestamp:

Mar 16, 2016, 9:46:12 AM (9 years ago)

Author:

Antti Koivisto

Message:

Don't invalidate style unnecessarily when setting inline style cssText
​https://bugs.webkit.org/show_bug.cgi?id=155541
rdar://problem/23318893

Reviewed by Simon Fraser.

Source/WebCore:

We currently invalidate style when cssText is set whether the style declaration changed or not.

Based on a patch by Simon.

Test: fast/css/style-invalidation-inline-csstext.html

• css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::PropertySetCSSStyleDeclaration::cssText):
(WebCore::PropertySetCSSStyleDeclaration::setCssText):

Invalidate only if the parsed style changed.

• css/StyleProperties.cpp:

(WebCore::MutableStyleProperties::parseDeclaration):

Compare the original and new style after parsing, return result.

• css/StyleProperties.h:

LayoutTests:

• fast/css/style-invalidation-inline-csstext-expected.txt: Added.
• fast/css/style-invalidation-inline-csstext.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/style-invalidation-inline-csstext-expected.txt (added)
• LayoutTests/fast/css/style-invalidation-inline-csstext.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (modified) (2 diffs)
• Source/WebCore/css/StyleProperties.cpp (modified) (2 diffs)
• Source/WebCore/css/StyleProperties.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2016-03-16  Antti Koivisto  <antti@apple.com>
+
+        Don't invalidate style unnecessarily when setting inline style cssText
+        https://bugs.webkit.org/show_bug.cgi?id=155541
+        rdar://problem/23318893
+
+        Reviewed by Simon Fraser.
+
+        * fast/css/style-invalidation-inline-csstext-expected.txt: Added.
+        * fast/css/style-invalidation-inline-csstext.html: Added.
+
 2016-03-16  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2016-03-16  Antti Koivisto  <antti@apple.com>
+
+        Don't invalidate style unnecessarily when setting inline style cssText
+        https://bugs.webkit.org/show_bug.cgi?id=155541
+        rdar://problem/23318893
+
+        Reviewed by Simon Fraser.
+
+        We currently invalidate style when cssText is set whether the style declaration changed or not.
+
+        Based on a patch by Simon.
+
+        Test: fast/css/style-invalidation-inline-csstext.html
+
+        * css/PropertySetCSSStyleDeclaration.cpp:
+        (WebCore::PropertySetCSSStyleDeclaration::cssText):
+        (WebCore::PropertySetCSSStyleDeclaration::setCssText):
+
+            Invalidate only if the parsed style changed.
+
+        * css/StyleProperties.cpp:
+        (WebCore::MutableStyleProperties::parseDeclaration):
+
+            Compare the original and new style after parsing, return result.
+
+        * css/StyleProperties.h:
+
 2016-03-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp ¶

@@ -146 +146 @@
     return m_propertySet->asText();
 }
-    
-void PropertySetCSSStyleDeclaration::setCssText(const String& text, ExceptionCode& ec)
+
+void PropertySetCSSStyleDeclaration::setCssText(const String& text, ExceptionCode&)
 {
     StyleAttributeMutationScope mutationScope(this);
@@ -153 +153 @@
         return;
 
-    ec = 0;
-    // FIXME: Detect syntax errors and set ec.
-    m_propertySet->parseDeclaration(text, contextStyleSheet());
-
-    didMutate(PropertyChanged);
+    bool changed = m_propertySet->parseDeclaration(text, contextStyleSheet());
+
+    didMutate(changed ? PropertyChanged : NoChanges);
 
     mutationScope.enqueueMutationRecord();    

trunk/Source/WebCore/css/StyleProperties.cpp ¶

@@ -844 +844 @@
 }
 
-void MutableStyleProperties::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
-{
+bool MutableStyleProperties::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
+{
+    auto oldProperties = WTFMove(m_propertyVector);
     m_propertyVector.clear();
 
@@ -855 +856 @@
     CSSParser parser(context);
     parser.parseDeclaration(this, styleDeclaration, 0, contextStyleSheet);
+
+    // We could do better. Just changing property order does not require style invalidation.
+    return oldProperties != m_propertyVector;
 }
 

trunk/Source/WebCore/css/StyleProperties.h ¶

@@ -224 +224 @@
 
     void clear();
-    void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
+    bool parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
 
     WEBCORE_EXPORT CSSStyleDeclaration* ensureCSSStyleDeclaration();