| 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) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "core/rendering/InlineIterator.h" | 46 #include "core/rendering/InlineIterator.h" |
| 47 #include "core/rendering/InlineTextBox.h" | 47 #include "core/rendering/InlineTextBox.h" |
| 48 #include "core/rendering/PaintInfo.h" | 48 #include "core/rendering/PaintInfo.h" |
| 49 #include "core/rendering/RenderCombineText.h" | 49 #include "core/rendering/RenderCombineText.h" |
| 50 #include "core/rendering/RenderDeprecatedFlexibleBox.h" | 50 #include "core/rendering/RenderDeprecatedFlexibleBox.h" |
| 51 #include "core/rendering/RenderFlexibleBox.h" | 51 #include "core/rendering/RenderFlexibleBox.h" |
| 52 #include "core/rendering/RenderFlowThread.h" | 52 #include "core/rendering/RenderFlowThread.h" |
| 53 #include "core/rendering/RenderGrid.h" | 53 #include "core/rendering/RenderGrid.h" |
| 54 #include "core/rendering/RenderInline.h" | 54 #include "core/rendering/RenderInline.h" |
| 55 #include "core/rendering/RenderLayer.h" | 55 #include "core/rendering/RenderLayer.h" |
| 56 #include "core/rendering/RenderMarquee.h" | |
| 57 #include "core/rendering/RenderObjectInlines.h" | 56 #include "core/rendering/RenderObjectInlines.h" |
| 58 #include "core/rendering/RenderRegion.h" | 57 #include "core/rendering/RenderRegion.h" |
| 59 #include "core/rendering/RenderTableCell.h" | 58 #include "core/rendering/RenderTableCell.h" |
| 60 #include "core/rendering/RenderTextControl.h" | 59 #include "core/rendering/RenderTextControl.h" |
| 61 #include "core/rendering/RenderTextFragment.h" | 60 #include "core/rendering/RenderTextFragment.h" |
| 62 #include "core/rendering/RenderTheme.h" | 61 #include "core/rendering/RenderTheme.h" |
| 63 #include "core/rendering/RenderView.h" | 62 #include "core/rendering/RenderView.h" |
| 64 #include "core/rendering/TextAutosizer.h" | 63 #include "core/rendering/TextAutosizer.h" |
| 65 #include "core/rendering/shapes/ShapeOutsideInfo.h" | 64 #include "core/rendering/shapes/ShapeOutsideInfo.h" |
| 66 #include "core/rendering/style/ContentData.h" | 65 #include "core/rendering/style/ContentData.h" |
| (...skipping 3082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3149 // FIXME: Remove this const_cast. | 3148 // FIXME: Remove this const_cast. |
| 3150 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre
dLogicalWidths(minLogicalWidth, maxLogicalWidth); | 3149 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre
dLogicalWidths(minLogicalWidth, maxLogicalWidth); |
| 3151 } else { | 3150 } else { |
| 3152 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); | 3151 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); |
| 3153 } | 3152 } |
| 3154 | 3153 |
| 3155 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); | 3154 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); |
| 3156 | 3155 |
| 3157 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth); | 3156 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth); |
| 3158 | 3157 |
| 3159 // A horizontal marquee with inline children has no minimum width. | |
| 3160 if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal()
) | |
| 3161 minLogicalWidth = 0; | |
| 3162 | |
| 3163 if (isTableCell()) { | 3158 if (isTableCell()) { |
| 3164 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth(
); | 3159 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth(
); |
| 3165 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) | 3160 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) |
| 3166 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW
idthForBoxSizing(tableCellWidth.value())); | 3161 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW
idthForBoxSizing(tableCellWidth.value())); |
| 3167 } | 3162 } |
| 3168 | 3163 |
| 3169 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); | 3164 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); |
| 3170 maxLogicalWidth += scrollbarWidth; | 3165 maxLogicalWidth += scrollbarWidth; |
| 3171 minLogicalWidth += scrollbarWidth; | 3166 minLogicalWidth += scrollbarWidth; |
| 3172 } | 3167 } |
| (...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4372 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 4367 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 4373 { | 4368 { |
| 4374 showRenderObject(); | 4369 showRenderObject(); |
| 4375 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 4370 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 4376 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 4371 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 4377 } | 4372 } |
| 4378 | 4373 |
| 4379 #endif | 4374 #endif |
| 4380 | 4375 |
| 4381 } // namespace blink | 4376 } // namespace blink |
| OLD | NEW |