Changeset 91314 in webkit

Timestamp:

Jul 19, 2011 3:49:32 PM (13 years ago)

Author:

mitz@apple.com

Message:

Nothing printed when specifying a very large maximum layout width
​https://bugs.webkit.org/show_bug.cgi?id=64831

Reviewed by Beth Dakin.

I am not adding a test because the DumpRenderTree printing test machinery is based on PrintContext,
which does not exercise the code path on which this bug lies.

• page/FrameView.cpp:

(WebCore::FrameView::forceLayoutForPagination): Fixed an integer overflow.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-19  Dan Bernstein  <mitz@apple.com>
+
+        Nothing printed when specifying a very large maximum layout width
+        https://bugs.webkit.org/show_bug.cgi?id=64831
+
+        Reviewed by Beth Dakin.
+
+        I am not adding a test because the DumpRenderTree printing test machinery is based on PrintContext,
+        which does not exercise the code path on which this bug lies.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::forceLayoutForPagination): Fixed an integer overflow.
+
 2011-07-19  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2633 +2633 @@
         int docLogicalWidth = horizontalWritingMode ? root->documentRect().width() : root->documentRect().height();
         if (docLogicalWidth > pageLogicalWidth) {
-            flooredPageLogicalWidth = std::min<int>(docLogicalWidth, pageLogicalWidth * maximumShrinkFactor);
+            flooredPageLogicalWidth = std::min<float>(docLogicalWidth, pageLogicalWidth * maximumShrinkFactor);
             if (pageLogicalHeight)
                 root->setPageLogicalHeight(flooredPageLogicalWidth / pageSize.width() * pageSize.height());