Changeset 64187 in webkit

Timestamp:

Jul 27, 2010 8:48:36 PM (14 years ago)

Author:

yuzo@google.com

Message:

2010-07-26 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

@page rules in media queries should be tested.
Added tests for such rules.
​https://bugs.webkit.org/show_bug.cgi?id=42971

• printing/page-rule-selection-expected.txt:
• printing/page-rule-selection.html:

2010-07-26 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

@page rules in media queries should be tested.
​https://bugs.webkit.org/show_bug.cgi?id=42971

• page/PrintContext.cpp: (WebCore::PrintContext::pageProperty): Fixed to properly begin printing. Added support for size property.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/page-rule-selection-expected.txt (modified) (1 diff)
• LayoutTests/printing/page-rule-selection.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/PrintContext.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-26  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        @page rules in media queries should be tested.
+        Added tests for such rules.
+        https://bugs.webkit.org/show_bug.cgi?id=42971
+
+        * printing/page-rule-selection-expected.txt:
+        * printing/page-rule-selection.html:
+
 2010-07-27  Daniel Bates  <dbates@rim.com>
 

trunk/LayoutTests/printing/page-rule-selection-expected.txt

@@ -50 +50 @@
 PASS layoutTestController.pageProperty('font-family', 0) is "Arial"
 PASS layoutTestController.pageProperty('font-size', 0) is "30"
+Check @media rules.
+PASS layoutTestController.pageProperty('size', 0) is "100 200"
+PASS layoutTestController.pageProperty('size', 0) is "150 250"
+PASS layoutTestController.pageProperty('size', 0) is "150 250"
 PASS successfullyParsed is true
 

trunk/LayoutTests/printing/page-rule-selection.html

@@ -85 +85 @@
         shouldBeEqualToString("layoutTestController.pageProperty('font-size', 0)", "30");
         appendStyle("@page { zoom:100%; }");
+
+        debug("Check @media rules.");
+        appendStyle("@page { size:100px 200px; }");
+        shouldBeEqualToString("layoutTestController.pageProperty('size', 0)", "100 200");
+        appendStyle("@media print { @page { size:150px 250px; } }");
+        shouldBeEqualToString("layoutTestController.pageProperty('size', 0)", "150 250");
+        appendStyle("@media screen { @page { size:300px 500px; } }");
+        shouldBeEqualToString("layoutTestController.pageProperty('size', 0)", "150 250");
+
     } else {
         testFailed("This test can be run only with window.layoutTestController");

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-26  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        @page rules in media queries should be tested.
+        https://bugs.webkit.org/show_bug.cgi?id=42971
+
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::pageProperty): Fixed to properly begin
+        printing. Added support for size property.
+
 2010-07-27  James Hawkins  <jhawkins@chromium.org>
 

trunk/WebCore/page/PrintContext.cpp

@@ -203 +203 @@
 {
     Document* document = frame->document();
+    PrintContext printContext(frame);
+    printContext.begin(800); // Any width is OK here.
     document->updateLayout();
     RefPtr<RenderStyle> style = document->styleForPage(pageNumber);
@@ -218 +220 @@
     if (!strcmp(propertyName, "font-family"))
         return String::format("%s", style->fontDescription().family().family().string().utf8().data());
+    if (!strcmp(propertyName, "size"))
+        return String::format("%d %d", style->pageSize().width().rawValue(), style->pageSize().height().rawValue());
 
     return String::format("pageProperty() unimplemented for: %s", propertyName);