Changeset 201075 in webkit

Timestamp:

May 18, 2016, 7:21:37 AM (9 years ago)

Author:

Antti Koivisto

Message:

Resolve !important properties from different shadow trees in a single pass.
​https://bugs.webkit.org/show_bug.cgi?id=157836

Reviewed by Andreas Kling.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::CascadedProperties::addImportantMatches):

Instead of doing multiple passes over increasing tree context ordinals collect matches with
non-zero ordinals to a vector and sort it to ascending order.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-18  Antti Koivisto  <antti@apple.com>
+
+        Resolve !important properties from different shadow trees in a single pass.
+        https://bugs.webkit.org/show_bug.cgi?id=157836
+
+        Reviewed by Andreas Kling.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::CascadedProperties::addImportantMatches):
+
+        Instead of doing multiple passes over increasing tree context ordinals collect matches with
+        non-zero ordinals to a vector and sort it to ascending order.
+
 2016-05-18  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2419 +2419 @@
         return;
 
-    unsigned highestTreeContextOrdinal = 0;
-    for (unsigned treeContextPass = 0; treeContextPass <= highestTreeContextOrdinal; ++treeContextPass) {
-        for (int i = startIndex; i <= endIndex; ++i) {
-            const MatchedProperties& matchedProperties = matchResult.matchedProperties()[i];
-
-            if (!hasImportantProperties(*matchedProperties.properties))
-                continue;
-
-            // For !important properties a later shadow tree wins. Do multiple passes to apply in correct order if needed.
-            // Matched properties are sorted in reverse tree context order so this is not needed for normal properties.
-            if (matchedProperties.treeContextOrdinal != treeContextPass) {
-                highestTreeContextOrdinal = std::max(matchedProperties.treeContextOrdinal, highestTreeContextOrdinal);
-                continue;
-            }
-
-            addMatch(matchResult, i, true, inheritedOnly);
-        }
-    }
+    struct IndexAndOrdinal {
+        int index;
+        unsigned ordinal;
+    };
+    Vector<IndexAndOrdinal> shadowTreeMatches;
+
+    for (int i = startIndex; i <= endIndex; ++i) {
+        const MatchedProperties& matchedProperties = matchResult.matchedProperties()[i];
+
+        if (!hasImportantProperties(*matchedProperties.properties))
+            continue;
+
+        if (matchedProperties.treeContextOrdinal) {
+            shadowTreeMatches.append({ i, matchedProperties.treeContextOrdinal });
+            continue;
+        }
+
+        addMatch(matchResult, i, true, inheritedOnly);
+    }
+
+    if (shadowTreeMatches.isEmpty())
+        return;
+
+    // For !important properties a later shadow tree wins.
+    // Match results are sorted in reverse tree context order so this is not needed for normal properties.
+    std::stable_sort(shadowTreeMatches.begin(), shadowTreeMatches.end(), [] (const IndexAndOrdinal& a, const IndexAndOrdinal& b) {
+        return a.ordinal < b.ordinal;
+    });
+
+    for (auto& match : shadowTreeMatches)
+        addMatch(matchResult, match.index, true, inheritedOnly);
 }