From fe9aa27ab5e6aecd4b3abea86d55c603bf9b7a91 Mon Sep 17 00:00:00 2001
From: Rafael Weinstein <rafaelw@chromium.org>
Date: Tue, 9 Dec 2014 15:05:42 -0800
Subject: [PATCH] Fix id/class collection from stylesheets

BUG=438036
R=esprehn@chromium.org

Review URL: https://codereview.chromium.org/785313002
---
 engine/core/css/RuleFeature.cpp        |  6 +++---
 tests/lowlevel/bug-438036-expected.txt |  6 ++++++
 tests/lowlevel/bug-438036.sky          | 29 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 tests/lowlevel/bug-438036-expected.txt
 create mode 100644 tests/lowlevel/bug-438036.sky

diff --git a/engine/core/css/RuleFeature.cpp b/engine/core/css/RuleFeature.cpp
index 64a18ca083c..4e807a900df 100644
--- a/engine/core/css/RuleFeature.cpp
+++ b/engine/core/css/RuleFeature.cpp
@@ -67,10 +67,10 @@ void RuleFeatureSet::collectFeaturesFromRuleData(const RuleData& ruleData)
 
 void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector& selector)
 {
-    addSelectorFeatures(selector);
-
-    for (const CSSSelector* current = &selector; current; current = current->tagHistory())
+    for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
+        addSelectorFeatures(*current);
         collectFeaturesFromSelectorList(current->selectorList());
+   }
 }
 
 void RuleFeatureSet::collectFeaturesFromSelectorList(const CSSSelectorList* selectorList)
diff --git a/tests/lowlevel/bug-438036-expected.txt b/tests/lowlevel/bug-438036-expected.txt
new file mode 100644
index 00000000000..9aa67ae5116
--- /dev/null
+++ b/tests/lowlevel/bug-438036-expected.txt
@@ -0,0 +1,6 @@
+Running 2 tests
+ok 1 Div width should grow width to 200px
+ok 2 Div width should grow height to 200px
+2 tests
+2 pass
+0 fail
diff --git a/tests/lowlevel/bug-438036.sky b/tests/lowlevel/bug-438036.sky
new file mode 100644
index 00000000000..0ff4d278592
--- /dev/null
+++ b/tests/lowlevel/bug-438036.sky
@@ -0,0 +1,29 @@
+<sky>
+<import src="../resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<style>
+  div { width: 100px; height: 100px; background-color: red; }
+  div.wide { width: 200px; }
+  div#high { height: 200px; }
+</style>
+<div></div>
+<div></div>
+<script>
+
+describe("Div width", function() {
+  it("should grow width to 200px", function() {
+    var target = document.querySelector('div');
+
+    target.classList.add("wide");
+    assert.equal(getComputedStyle(target).width, "200px");
+  });
+
+  it("should grow height to 200px", function() {
+    var target = document.querySelectorAll('div')[1];
+
+    target.id = 'high';
+    assert.equal(getComputedStyle(target).height, "200px");
+  });
+});
+</script>
+</sky>