Changeset 60992 in webkit

Timestamp:

Jun 10, 2010 10:51:38 PM (14 years ago)

Author:

yuzo@google.com

Message:

2010-06-10 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Fix Bug 40452: REGRESSION: printing is broken if stylesheet has @page
​https://bugs.webkit.org/show_bug.cgi?id=40452

• platform/chromium/test_expectations.txt:
• platform/mac/printing/page-rule-in-media-query-expected.checksum: Added.
• platform/mac/printing/page-rule-in-media-query-expected.png: Added.
• platform/mac/printing/page-rule-in-media-query-expected.txt: Added.
• printing/page-rule-in-media-query.html: Added.

2010-06-10 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Fix Bug 40452: REGRESSION: printing is broken if stylesheet has @page
​https://bugs.webkit.org/show_bug.cgi?id=40452

Test: printing/page-rule-in-media-query.html

• css/CSSStyleSelector.cpp: (WebCore::CSSRuleSet::addRulesFromSheet): (WebCore::CSSRuleSet::addStyleRule):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/mac/printing/page-rule-in-media-query-expected.checksum (added)
• LayoutTests/platform/mac/printing/page-rule-in-media-query-expected.png (added)
• LayoutTests/platform/mac/printing/page-rule-in-media-query-expected.txt (added)
• LayoutTests/printing/page-rule-in-media-query.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-10  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fix Bug 40452: REGRESSION: printing is broken if stylesheet has @page
+        https://bugs.webkit.org/show_bug.cgi?id=40452
+
+        * platform/chromium/test_expectations.txt:
+        * platform/mac/printing/page-rule-in-media-query-expected.checksum: Added.
+        * platform/mac/printing/page-rule-in-media-query-expected.png: Added.
+        * platform/mac/printing/page-rule-in-media-query-expected.txt: Added.
+        * printing/page-rule-in-media-query.html: Added.
+
 2010-06-10  Oliver Hunt  <oliver@apple.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -311 +311 @@
 // These tests try to print a PDF file as the expected result.  I don't think
 // we plan on supporting this anytime soon.
+WONTFIX SKIP : printing/compositing-layer-printing.html = PASS
 WONTFIX SKIP : printing/media-queries-print.html = PASS
-WONTFIX SKIP : printing/compositing-layer-printing.html = PASS
+WONTFIX SKIP : printing/page-rule-in-media-query.html = PASS
 
 // Chrome doesn't call the willCacheResponse callback (a method

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-10  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fix Bug 40452: REGRESSION: printing is broken if stylesheet has @page
+        https://bugs.webkit.org/show_bug.cgi?id=40452
+
+        Test: printing/page-rule-in-media-query.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSRuleSet::addRulesFromSheet):
+        (WebCore::CSSRuleSet::addStyleRule):
+
 2010-06-10  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -358 +358 @@
     
     void addRulesFromSheet(CSSStyleSheet*, const MediaQueryEvaluator&, CSSStyleSelector* = 0);
-    
+
+    void addStyleRule(StyleBase* item);
     void addRule(CSSStyleRule* rule, CSSSelector* sel);
     void addPageRule(CSSStyleRule* rule, CSSSelector* sel);
@@ -2769 +2770 @@
         StyleBase* item = sheet->item(i);
         if (item->isStyleRule()) {
-            if (item->isPageRule()) {
-                CSSPageRule* pageRule = static_cast<CSSPageRule*>(item);
-                addPageRule(pageRule, pageRule->selectorList().first());
-            } else {
-                CSSStyleRule* rule = static_cast<CSSStyleRule*>(item);
-                for (CSSSelector* s = rule->selectorList().first(); s; s = CSSSelectorList::next(s))
-                    addRule(rule, s);
-            }
+            addStyleRule(item);
         }
         else if (item->isImportRule()) {
@@ -2793 +2787 @@
                     if (childItem->isStyleRule()) {
                         // It is a StyleRule, so append it to our list
-                        CSSStyleRule* rule = static_cast<CSSStyleRule*>(childItem);
-                        for (CSSSelector* s = rule->selectorList().first(); s; s = CSSSelectorList::next(s))
-                            addRule(rule, s);
+                        addStyleRule(childItem);
                     } else if (childItem->isFontFaceRule() && styleSelector) {
                         // Add this font face to our set.
@@ -2817 +2809 @@
         } else if (item->isKeyframesRule())
             styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(item));
+    }
+}
+
+void CSSRuleSet::addStyleRule(StyleBase* item)
+{
+    if (item->isPageRule()) {
+        CSSPageRule* pageRule = static_cast<CSSPageRule*>(item);
+        addPageRule(pageRule, pageRule->selectorList().first());
+    } else {
+        CSSStyleRule* rule = static_cast<CSSStyleRule*>(item);
+        for (CSSSelector* s = rule->selectorList().first(); s; s = CSSSelectorList::next(s))
+            addRule(rule, s);
     }
 }