Changeset 112099 in webkit

Timestamp:

Mar 26, 2012 8:16:38 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] In region styling (@-webkit-region) the position for CSS rules is incorrectly computed
​https://bugs.webkit.org/show_bug.cgi?id=81901

Patch by Mihai Balan <​mibalan@adobe.com> on 2012-03-26
Reviewed by Antti Koivisto.

Source/WebCore:

Right now CSS rules position does not take into account rules that are inside a @-webkit-region
declaration, leading to buggy behavior where rules that appear later in the document are superseded
by rules that appear earlier in the document (opposite as how things should be). The fix updates
the "global" rules counter once the rules in a @-webkit-region declaration have been added.

Tests: fast/regions/region-style-rule-position-expected.html

fast/regions/region-style-rule-position.html

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

LayoutTests:

Ref tests for bug #81901. Testing that CSS rules position is properly computed when having multiple
@-webkit-region declarations.

• fast/regions/region-style-rule-position-expected.html: Added.
• fast/regions/region-style-rule-position.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/region-style-rule-position-expected.html (added)
• LayoutTests/fast/regions/region-style-rule-position.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-26  Mihai Balan  <mibalan@adobe.com>
+
+        [CSS Regions] In region styling (@-webkit-region) the position for CSS rules is incorrectly computed
+        https://bugs.webkit.org/show_bug.cgi?id=81901
+
+        Reviewed by Antti Koivisto.
+
+        Ref tests for bug #81901. Testing that CSS rules position is properly computed when having multiple
+        @-webkit-region declarations.
+
+        * fast/regions/region-style-rule-position-expected.html: Added.
+        * fast/regions/region-style-rule-position.html: Added.
+
 2012-03-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  Mihai Balan  <mibalan@adobe.com>
+
+        [CSS Regions] In region styling (@-webkit-region) the position for CSS rules is incorrectly computed
+        https://bugs.webkit.org/show_bug.cgi?id=81901
+
+        Reviewed by Antti Koivisto.
+
+        Right now CSS rules position does not take into account rules that are inside a @-webkit-region
+        declaration, leading to buggy behavior where rules that appear later in the document are superseded
+        by rules that appear earlier in the document (opposite as how things should be). The fix updates
+        the "global" rules counter once the rules in a @-webkit-region declaration have been added.
+
+        Tests: fast/regions/region-style-rule-position-expected.html
+               fast/regions/region-style-rule-position.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
 2012-03-26  Pierre Rossi  <pierre.rossi@nokia.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -2438 +2438 @@
             regionRuleSet->addStyleRule(static_cast<CSSStyleRule*>(regionStylingRule)->styleRule(), true, true);
     }
+    // Update the "global" rule count so that proper order is maintained
+    m_ruleCount = regionRuleSet->m_ruleCount;
 
     m_regionSelectorsAndRuleSets.append(RuleSetSelectorPair(regionRule->selectorList().first(), regionRuleSet));