Changeset 153608 in webkit

Timestamp:

Aug 1, 2013 2:25:33 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (Safari 6 - ToT): Incorrectly assumes that RenderStyle data can be shared
​https://bugs.webkit.org/show_bug.cgi?id=113058

Source/WebCore:

Before sharing CSS properties with an element in the cache, we need to
check that the new element is suitable for this, just like we check
elements before inserting them into the cache.

Patch by Morten Stenshorne <​mstensho@opera.com> on 2013-08-01
Reviewed by Andreas Kling.

Test: fast/css/identical-logical-height-decl.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyMatchedProperties):

LayoutTests:

Patch by Morten Stenshorne <​mstensho@opera.com> on 2013-08-01
Reviewed by Andreas Kling.

• fast/css/identical-logical-height-decl-expected.html: Added.
• fast/css/identical-logical-height-decl.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/identical-logical-height-decl-expected.html (added)
• LayoutTests/fast/css/identical-logical-height-decl.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-01  Morten Stenshorne  <mstensho@opera.com>
+
+        REGRESSION (Safari 6 - ToT): Incorrectly assumes that RenderStyle data can be shared
+        https://bugs.webkit.org/show_bug.cgi?id=113058
+
+        Reviewed by Andreas Kling.
+
+        * fast/css/identical-logical-height-decl-expected.html: Added.
+        * fast/css/identical-logical-height-decl.html: Added.
+
 2013-08-01  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-01  Morten Stenshorne  <mstensho@opera.com>
+
+        REGRESSION (Safari 6 - ToT): Incorrectly assumes that RenderStyle data can be shared
+        https://bugs.webkit.org/show_bug.cgi?id=113058
+
+        Before sharing CSS properties with an element in the cache, we need to
+        check that the new element is suitable for this, just like we check
+        elements before inserting them into the cache.
+
+        Reviewed by Andreas Kling.
+
+        Test: fast/css/identical-logical-height-decl.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyMatchedProperties):
+
 2013-08-01  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1847 +1847 @@
     bool applyInheritedOnly = false;
     const MatchedPropertiesCacheItem* cacheItem = 0;
-    if (cacheHash && (cacheItem = findFromMatchedPropertiesCache(cacheHash, matchResult))) {
+    if (cacheHash && (cacheItem = findFromMatchedPropertiesCache(cacheHash, matchResult))
+        && isCacheableInMatchedPropertiesCache(element, state.style(), state.parentStyle())) {
         // We can build up the style by copying non-inherited properties from an earlier style object built using the same exact
         // style declarations. We then only need to apply the inherited properties, if any, as their values can depend on the