fix cascading order

CSS data given in style="" attributes can be overruled by
AUTHOR_IMPORTANT style data.
This fixes
http://www.w3.org/Style/CSS/Test/CSS2.1/current/html4/t060402-c31-important-00-b.htm

1 files changed, 14 insertions, 7 deletions

diff --git a/src/css.cc b/src/css.cc
index e9838ce7..01ebdc5b 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -384,19 +384,26 @@ void CssContext::apply (CssPropertyList *props, Doctree *docTree,
          CssPropertyList *tagStyle, CssPropertyList *nonCssHints) {
    const DoctreeNode *node = docTree->top ();
 
-   for (int o = CSS_PRIMARY_USER_AGENT; o <= CSS_PRIMARY_USER; o++)
-      if (sheet[o])
-         sheet[o]->apply (props, docTree, node);
+   if (sheet[CSS_PRIMARY_USER_AGENT])
+      sheet[CSS_PRIMARY_USER_AGENT]->apply (props, docTree, node);
+
+   if (sheet[CSS_PRIMARY_USER])
+      sheet[CSS_PRIMARY_USER]->apply (props, docTree, node);
 
    if (nonCssHints)
         nonCssHints->apply (props);
-
-   for (int o = CSS_PRIMARY_AUTHOR; o <= CSS_PRIMARY_USER_IMPORTANT; o++)
-      if (sheet[o])
-         sheet[o]->apply (props, docTree, node);
+   
+   if (sheet[CSS_PRIMARY_AUTHOR])
+      sheet[CSS_PRIMARY_AUTHOR]->apply (props, docTree, node);
 
    if (tagStyle)
         tagStyle->apply (props);
+
+   if (sheet[CSS_PRIMARY_AUTHOR_IMPORTANT])
+      sheet[CSS_PRIMARY_AUTHOR_IMPORTANT]->apply (props, docTree, node);
+
+   if (sheet[CSS_PRIMARY_USER_IMPORTANT])
+      sheet[CSS_PRIMARY_USER_IMPORTANT]->apply (props, docTree, node);
 }
 
 void CssContext::addRule (CssSelector *sel, CssPropertyList *props,