| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 | 270 |
| 271 checkRegionStyle(); | 271 checkRegionStyle(); |
| 272 updateRegionHasAutoLogicalHeightFlag(); | 272 updateRegionHasAutoLogicalHeightFlag(); |
| 273 | 273 |
| 274 if (oldStyle && oldStyle->writingMode() != style()->writingMode()) | 274 if (oldStyle && oldStyle->writingMode() != style()->writingMode()) |
| 275 m_flowThread->regionChangedWritingMode(this); | 275 m_flowThread->regionChangedWritingMode(this); |
| 276 } | 276 } |
| 277 | 277 |
| 278 void RenderRegion::layoutBlock(bool relayoutChildren, LayoutUnit) | 278 void RenderRegion::layoutBlock(bool relayoutChildren, LayoutUnit) |
| 279 { | 279 { |
| 280 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 281 RenderBlock::layoutBlock(relayoutChildren); | 280 RenderBlock::layoutBlock(relayoutChildren); |
| 282 | 281 |
| 283 if (isValid()) { | 282 if (isValid()) { |
| 284 LayoutRect oldRegionRect(flowThreadPortionRect()); | 283 LayoutRect oldRegionRect(flowThreadPortionRect()); |
| 285 if (!isHorizontalWritingMode()) | 284 if (!isHorizontalWritingMode()) |
| 286 oldRegionRect = oldRegionRect.transposedRect(); | 285 oldRegionRect = oldRegionRect.transposedRect(); |
| 287 | 286 |
| 288 if (hasAutoLogicalHeight() && !m_flowThread->inConstrainedLayoutPhase())
{ | 287 if (hasAutoLogicalHeight() && !m_flowThread->inConstrainedLayoutPhase())
{ |
| 289 m_flowThread->invalidateRegions(); | 288 m_flowThread->invalidateRegions(); |
| 290 clearComputedAutoHeight(); | 289 clearComputedAutoHeight(); |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 | 644 |
| 646 LayoutUnit autoHeight = hasOverrideHeight() ? overrideLogicalContentHeight()
: computedAutoHeight(); | 645 LayoutUnit autoHeight = hasOverrideHeight() ? overrideLogicalContentHeight()
: computedAutoHeight(); |
| 647 | 646 |
| 648 LayoutUnit newLogicalHeight = autoHeight + borderAndPaddingLogicalHeight(); | 647 LayoutUnit newLogicalHeight = autoHeight + borderAndPaddingLogicalHeight(); |
| 649 ASSERT(newLogicalHeight < LayoutUnit::max() / 2); | 648 ASSERT(newLogicalHeight < LayoutUnit::max() / 2); |
| 650 if (newLogicalHeight > logicalHeight()) | 649 if (newLogicalHeight > logicalHeight()) |
| 651 setLogicalHeight(newLogicalHeight); | 650 setLogicalHeight(newLogicalHeight); |
| 652 } | 651 } |
| 653 | 652 |
| 654 } // namespace WebCore | 653 } // namespace WebCore |
| OLD | NEW |