Source/WebCore/rendering/RenderBox.cpp - Issue 12315018: Merge 142816

Side by Side Diff: Source/WebCore/rendering/RenderBox.cpp

Issue 12315018: Merge 142816 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « Source/WebCore/rendering/RenderBox.h ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)	4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)

5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)	5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)

6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.	6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 2265 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2276 shouldFlipBeforeAfter ? computedValues.m_margins.m_before : computedValues.m_margins.m_after);	2276 shouldFlipBeforeAfter ? computedValues.m_margins.m_before : computedValues.m_margins.m_after);

2277 }	2277 }

2278 }	2278 }

2279	2279

2280 // WinIE quirk: The <html> block always fills the entire canvas in quirks mo de. The <body> always fills the	2280 // WinIE quirk: The <html> block always fills the entire canvas in quirks mo de. The <body> always fills the

2281 // <html> block in quirks mode. Only apply this quirk if the block is norma l flow and no height	2281 // <html> block in quirks mode. Only apply this quirk if the block is norma l flow and no height

2282 // is specified. When we're printing, we also need this quirk if the body or root has a percentage	2282 // is specified. When we're printing, we also need this quirk if the body or root has a percentage

2283 // height since we don't set a height in RenderView when we're printing. So without this quirk, the	2283 // height since we don't set a height in RenderView when we're printing. So without this quirk, the

2284 // height has nothing to be a percentage of, and it ends up being 0. That is bad.	2284 // height has nothing to be a percentage of, and it ends up being 0. That is bad.

2285 bool paginatedContentNeedsBaseHeight = document()->printing() && h.isPercent ()	2285 bool paginatedContentNeedsBaseHeight = document()->printing() && h.isPercent ()

2286 && (isRoot() \|\| (isBody() && document()->documentElement()->renderer()-> style()->logicalHeight().isPercent()));	2286 && (isRoot() \|\| (isBody() && document()->documentElement()->renderer()-> style()->logicalHeight().isPercent())) && !isInline();

2287 if (stretchesToViewport() \|\| paginatedContentNeedsBaseHeight) {	2287 if (stretchesToViewport() \|\| paginatedContentNeedsBaseHeight) {

2288 // FIXME: Finish accounting for block flow here.	2288 // FIXME: Finish accounting for block flow here.

2289 // https://bugs.webkit.org/show_bug.cgi?id=46603	2289 // https://bugs.webkit.org/show_bug.cgi?id=46603

2290 LayoutUnit margins = collapsedMarginBefore() + collapsedMarginAfter();	2290 LayoutUnit margins = collapsedMarginBefore() + collapsedMarginAfter();

2291 LayoutUnit visHeight;	2291 LayoutUnit visHeight;

2292 if (document()->printing())	2292 if (document()->printing())

2293 visHeight = static_cast<LayoutUnit>(view()->pageLogicalHeight());	2293 visHeight = static_cast<LayoutUnit>(view()->pageLogicalHeight());

2294 else {	2294 else {

2295 if (isHorizontalWritingMode())	2295 if (isHorizontalWritingMode())

2296 visHeight = view()->viewHeight();	2296 visHeight = view()->viewHeight();

(...skipping 2026 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4323	4323

4324 void RenderBox::reportStaticMembersMemoryUsage(MemoryInstrumentation* memoryInst rumentation)	4324 void RenderBox::reportStaticMembersMemoryUsage(MemoryInstrumentation* memoryInst rumentation)

4325 {	4325 {

4326 memoryInstrumentation->addRootObject(gOverrideHeightMap, WebCoreMemoryTypes: :RenderingStructures);	4326 memoryInstrumentation->addRootObject(gOverrideHeightMap, WebCoreMemoryTypes: :RenderingStructures);

4327 memoryInstrumentation->addRootObject(gOverrideWidthMap, WebCoreMemoryTypes:: RenderingStructures);	4327 memoryInstrumentation->addRootObject(gOverrideWidthMap, WebCoreMemoryTypes:: RenderingStructures);

4328 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalHeightMa p, WebCoreMemoryTypes::RenderingStructures);	4328 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalHeightMa p, WebCoreMemoryTypes::RenderingStructures);

4329 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalWidthMap , WebCoreMemoryTypes::RenderingStructures);	4329 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalWidthMap , WebCoreMemoryTypes::RenderingStructures);

4330 }	4330 }

4331	4331

4332 } // namespace WebCore	4332 } // namespace WebCore

OLD	NEW