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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "core/rendering/InlineIterator.h" | 45 #include "core/rendering/InlineIterator.h" |
46 #include "core/rendering/InlineTextBox.h" | 46 #include "core/rendering/InlineTextBox.h" |
47 #include "core/rendering/PaintInfo.h" | 47 #include "core/rendering/PaintInfo.h" |
48 #include "core/rendering/RenderCombineText.h" | 48 #include "core/rendering/RenderCombineText.h" |
49 #include "core/rendering/RenderDeprecatedFlexibleBox.h" | 49 #include "core/rendering/RenderDeprecatedFlexibleBox.h" |
50 #include "core/rendering/RenderFlexibleBox.h" | 50 #include "core/rendering/RenderFlexibleBox.h" |
51 #include "core/rendering/RenderFlowThread.h" | 51 #include "core/rendering/RenderFlowThread.h" |
52 #include "core/rendering/RenderGrid.h" | 52 #include "core/rendering/RenderGrid.h" |
53 #include "core/rendering/RenderInline.h" | 53 #include "core/rendering/RenderInline.h" |
54 #include "core/rendering/RenderLayer.h" | 54 #include "core/rendering/RenderLayer.h" |
55 #include "core/rendering/RenderMarquee.h" | |
56 #include "core/rendering/RenderObjectInlines.h" | 55 #include "core/rendering/RenderObjectInlines.h" |
57 #include "core/rendering/RenderRegion.h" | 56 #include "core/rendering/RenderRegion.h" |
58 #include "core/rendering/RenderTableCell.h" | 57 #include "core/rendering/RenderTableCell.h" |
59 #include "core/rendering/RenderTextControl.h" | 58 #include "core/rendering/RenderTextControl.h" |
60 #include "core/rendering/RenderTextFragment.h" | 59 #include "core/rendering/RenderTextFragment.h" |
61 #include "core/rendering/RenderTheme.h" | 60 #include "core/rendering/RenderTheme.h" |
62 #include "core/rendering/RenderView.h" | 61 #include "core/rendering/RenderView.h" |
63 #include "core/rendering/shapes/ShapeOutsideInfo.h" | 62 #include "core/rendering/shapes/ShapeOutsideInfo.h" |
64 #include "core/rendering/style/ContentData.h" | 63 #include "core/rendering/style/ContentData.h" |
65 #include "core/rendering/style/RenderStyle.h" | 64 #include "core/rendering/style/RenderStyle.h" |
(...skipping 3505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3571 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre
dLogicalWidths(minLogicalWidth, maxLogicalWidth); | 3570 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre
dLogicalWidths(minLogicalWidth, maxLogicalWidth); |
3572 } else { | 3571 } else { |
3573 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); | 3572 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); |
3574 } | 3573 } |
3575 | 3574 |
3576 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); | 3575 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); |
3577 | 3576 |
3578 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth); | 3577 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth); |
3579 | 3578 |
3580 // A horizontal marquee with inline children has no minimum width. | 3579 // A horizontal marquee with inline children has no minimum width. |
3581 if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal()
) | 3580 if (childrenInline()) |
3582 minLogicalWidth = 0; | 3581 minLogicalWidth = 0; |
3583 | 3582 |
3584 if (isTableCell()) { | 3583 if (isTableCell()) { |
3585 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth(
); | 3584 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth(
); |
3586 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) | 3585 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) |
3587 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW
idthForBoxSizing(tableCellWidth.value())); | 3586 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW
idthForBoxSizing(tableCellWidth.value())); |
3588 } | 3587 } |
3589 | 3588 |
3590 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); | 3589 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); |
3591 maxLogicalWidth += scrollbarWidth; | 3590 maxLogicalWidth += scrollbarWidth; |
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4826 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 4825 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
4827 { | 4826 { |
4828 showRenderObject(); | 4827 showRenderObject(); |
4829 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 4828 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
4830 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 4829 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
4831 } | 4830 } |
4832 | 4831 |
4833 #endif | 4832 #endif |
4834 | 4833 |
4835 } // namespace blink | 4834 } // namespace blink |
OLD | NEW |