Changeset 98637 in webkit

Timestamp:

Oct 27, 2011, 2:09:24 PM (13 years ago)

Author:

fsamuel@chromium.org

Message:

iframes seem to occasionally doubly scale or scale incorrectly when pageScaleFactor != 1.0
​https://bugs.webkit.org/show_bug.cgi?id=70552

Reviewed by Simon Fraser.

Source/WebCore:

Test: fast/frames/iframe-double-scale-contents.html

The iframe's document style was using the page's scale factor, rather than the frame's (1.0).
If the page scale factor was set after layout was complete, then this would have no impact because the iframe's document style and layout is not recomputed,
but if the page scale factor is set prior to creating and laying out the iframe, the iframe's content would be doubly scaled.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::styleForDocument):

LayoutTests:

• fast/frames/iframe-double-scale-contents-expected.png: Added.
• fast/frames/iframe-double-scale-contents-expected.txt: Added.
• fast/frames/iframe-double-scale-contents.html: Added.
• fast/frames/resources/iframe-content-scaling-bug-iframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/iframe-double-scale-contents-expected.png (added)
• LayoutTests/fast/frames/iframe-double-scale-contents-expected.txt (added)
• LayoutTests/fast/frames/iframe-double-scale-contents.html (added)
• LayoutTests/fast/frames/resources/iframe-content-scaling-bug-iframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-27  Fady Samuel  <fsamuel@chromium.org>
+
+        iframes seem to occasionally doubly scale or scale incorrectly when pageScaleFactor != 1.0
+        https://bugs.webkit.org/show_bug.cgi?id=70552
+
+        Reviewed by Simon Fraser.
+
+        * fast/frames/iframe-double-scale-contents-expected.png: Added.
+        * fast/frames/iframe-double-scale-contents-expected.txt: Added.
+        * fast/frames/iframe-double-scale-contents.html: Added.
+        * fast/frames/resources/iframe-content-scaling-bug-iframe.html: Added.
+
 2011-10-27  Mike Reed  <reed@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-27  Fady Samuel  <fsamuel@chromium.org>
+
+        iframes seem to occasionally doubly scale or scale incorrectly when pageScaleFactor != 1.0
+        https://bugs.webkit.org/show_bug.cgi?id=70552
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/frames/iframe-double-scale-contents.html
+
+        The iframe's document style was using the page's scale factor, rather than the frame's (1.0).
+        If the page scale factor was set after layout was complete, then this would have no impact because the iframe's document style and layout is not recomputed, 
+        but if the page scale factor is set prior to creating and laying out the iframe, the iframe's content would be doubly scaled.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::styleForDocument):
+
 2011-10-27  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -1135 +1135 @@
     documentStyle->setRTLOrdering(document->visuallyOrdered() ? VisualOrder : LogicalOrder);
     documentStyle->setZoom(frame ? frame->pageZoomFactor() : 1);
-    documentStyle->setPageScaleTransform(document->page() ? document->page()->pageScaleFactor() : 1);
+    documentStyle->setPageScaleTransform(frame ? frame->frameScaleFactor() : 1);
     documentStyle->setUserModify(document->inDesignMode() ? READ_WRITE : READ_ONLY);