Title: [109073] trunk
- Revision
- 109073
- Author
- e...@chromium.org
- Date
- 2012-02-27 21:42:45 -0800 (Mon, 27 Feb 2012)
Log Message
Printed font-size should not be dependant on zoom level
https://bugs.webkit.org/show_bug.cgi?id=79717
Reviewed by Adam Barth.
Ignore full page zoom level when printing a document.
Source/WebCore:
Test: printing/zoomed-document.html
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::collectMatchingRulesForList):
LayoutTests:
* printing/zoomed-document-expected.txt: Added.
* printing/zoomed-document.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (109072 => 109073)
--- trunk/LayoutTests/ChangeLog 2012-02-28 05:29:54 UTC (rev 109072)
+++ trunk/LayoutTests/ChangeLog 2012-02-28 05:42:45 UTC (rev 109073)
@@ -1,3 +1,15 @@
+2012-02-27 Emil A Eklund <e...@chromium.org>
+
+ Printed font-size should not be dependant on zoom level
+ https://bugs.webkit.org/show_bug.cgi?id=79717
+
+ Reviewed by Adam Barth.
+
+ Ignore full page zoom level when printing a document.
+
+ * printing/zoomed-document-expected.txt: Added.
+ * printing/zoomed-document.html: Added.
+
2012-02-27 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r109041.
Added: trunk/LayoutTests/printing/zoomed-document-expected.txt (0 => 109073)
--- trunk/LayoutTests/printing/zoomed-document-expected.txt (rev 0)
+++ trunk/LayoutTests/printing/zoomed-document-expected.txt 2012-02-28 05:42:45 UTC (rev 109073)
@@ -0,0 +1 @@
+PASS Document zoom should not apply when printing.
Added: trunk/LayoutTests/printing/zoomed-document.html (0 => 109073)
--- trunk/LayoutTests/printing/zoomed-document.html (rev 0)
+++ trunk/LayoutTests/printing/zoomed-document.html 2012-02-28 05:42:45 UTC (rev 109073)
@@ -0,0 +1,27 @@
+<html>
+<body>
+<pre id="console">
+test
+</pre>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+
+ var msg = 'Document zoom should not apply when printing.';
+ var pass = true;
+
+ for (var i = 0; i < 10; i++) {
+ var numberOfPages = layoutTestController.numberOfPages(100, 30);
+ if (numberOfPages != 1) {
+ pass = false;
+ msg += 'Got ' + numberOfPages + ' pages, expected 1.\n';
+ }
+ eventSender.zoomPageIn();
+ }
+
+ msg = (pass ? 'PASS' : 'FAIL') + ' ' + msg;
+ document.querySelector('#console').textContent = msg;
+}
+</script>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (109072 => 109073)
--- trunk/Source/WebCore/ChangeLog 2012-02-28 05:29:54 UTC (rev 109072)
+++ trunk/Source/WebCore/ChangeLog 2012-02-28 05:42:45 UTC (rev 109073)
@@ -1,3 +1,17 @@
+2012-02-27 Emil A Eklund <e...@chromium.org>
+
+ Printed font-size should not be dependant on zoom level
+ https://bugs.webkit.org/show_bug.cgi?id=79717
+
+ Reviewed by Adam Barth.
+
+ Ignore full page zoom level when printing a document.
+
+ Test: printing/zoomed-document.html
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
2012-02-27 Kenichi Ishibashi <ba...@chromium.org>
[Chromium] Unreviewed gardening, further compile fixes for
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (109072 => 109073)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-02-28 05:29:54 UTC (rev 109072)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-02-28 05:42:45 UTC (rev 109073)
@@ -1436,7 +1436,7 @@
RefPtr<RenderStyle> documentStyle = RenderStyle::create();
documentStyle->setDisplay(BLOCK);
documentStyle->setRTLOrdering(document->visuallyOrdered() ? VisualOrder : LogicalOrder);
- documentStyle->setZoom(frame ? frame->pageZoomFactor() : 1);
+ documentStyle->setZoom(frame && !document->printing() ? frame->pageZoomFactor() : 1);
documentStyle->setPageScaleTransform(frame ? frame->frameScaleFactor() : 1);
documentStyle->setUserModify(document->inDesignMode() ? READ_WRITE : READ_ONLY);
documentStyle->setLocale(document->contentLanguage());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
