Changeset 109073 in webkit

Timestamp:

Feb 27, 2012 9:42:45 PM (12 years ago)

Author:

eae@chromium.org

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/zoomed-document-expected.txt (added)
• LayoutTests/printing/zoomed-document.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-27  Emil A Eklund  <eae@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.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-27  Emil A Eklund  <eae@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  <bashi@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -1437 +1437 @@
     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);