Skip to content

GitLab

T
tangled
Commit 40ff0964 authored by bdakin@apple.com's avatar bdakin@apple.com
Browse files
Options

2009-04-28 Beth Dakin <bdakin@apple.com> 

        Reviewed by Sam Weinig.

        Fix for <rdar://problem/6419515> REGRESSION (r31037): Positioned 
        images with % height are collapsed when printing

        * rendering/RenderBox.cpp:
        (WebCore::RenderBox::calcHeight): Make sure we don't ignore 
        printing here!



git-svn-id: svn://svn.chromium.org/blink/trunk@42971 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 95c03e95
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 2 deletions
third_party/WebKit/WebCore/ChangeLog
View file @ 40ff0964
2009-04-28 Beth Dakin <bdakin@apple.com>
Reviewed by Sam Weinig.
Fix for <rdar://problem/6419515> REGRESSION (r31037): Positioned
images with % height are collapsed when printing
* rendering/RenderBox.cpp:
(WebCore::RenderBox::calcHeight): Make sure we don't ignore
printing here!
2009-04-28 Adele Peterson <adele@apple.com> 2009-04-28 Adele Peterson <adele@apple.com>
Reviewed by Darin Adler. Reviewed by Darin Adler.
third_party/WebKit/WebCore/rendering/RenderBox.cpp
View file @ 40ff0964
...@@ -1465,9 +1465,9 @@ void RenderBox::calcHeight() ...@@ -1465,9 +1465,9 @@ void RenderBox::calcHeight()
// WinIE quirk: The <html> block always fills the entire canvas in quirks mode. The <body> always fills the // WinIE quirk: The <html> block always fills the entire canvas in quirks mode. The <body> always fills the
// <html> block in quirks mode. Only apply this quirk if the block is normal flow and no height // <html> block in quirks mode. Only apply this quirk if the block is normal flow and no height
// is specified. // is specified.
if (stretchesToViewHeight() && !document()->printing()) { if (stretchesToViewHeight()) {
int margins = collapsedMarginTop() + collapsedMarginBottom(); int margins = collapsedMarginTop() + collapsedMarginBottom();
int visHeight = view()->viewHeight(); int visHeight = document()->printing() ? view()->frameView()->visibleHeight() : view()->viewHeight();
if (isRoot()) if (isRoot())
setHeight(max(height(), visHeight - margins)); setHeight(max(height(), visHeight - margins));
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment