| OLD | NEW |
| 1 /** | 1 /** |
| 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. |
| 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 textBlockStyle->setDisplay(BLOCK); | 83 textBlockStyle->setDisplay(BLOCK); |
| 84 textBlockStyle->setUnique(); | 84 textBlockStyle->setUnique(); |
| 85 | 85 |
| 86 return textBlockStyle.release(); | 86 return textBlockStyle.release(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayo
utChildren, SubtreeLayoutScope& layoutScope) | 89 LayoutObject* LayoutTextControlMultiLine::layoutSpecialExcludedChild(bool relayo
utChildren, SubtreeLayoutScope& layoutScope) |
| 90 { | 90 { |
| 91 LayoutObject* placeholderLayoutObject = LayoutTextControl::layoutSpecialExcl
udedChild(relayoutChildren, layoutScope); | 91 LayoutObject* placeholderLayoutObject = LayoutTextControl::layoutSpecialExcl
udedChild(relayoutChildren, layoutScope); |
| 92 if (!placeholderLayoutObject) | 92 if (!placeholderLayoutObject) |
| 93 return 0; | 93 return nullptr; |
| 94 if (!placeholderLayoutObject->isBox()) | 94 if (!placeholderLayoutObject->isBox()) |
| 95 return placeholderLayoutObject; | 95 return placeholderLayoutObject; |
| 96 LayoutBox* placeholderBox = toLayoutBox(placeholderLayoutObject); | 96 LayoutBox* placeholderBox = toLayoutBox(placeholderLayoutObject); |
| 97 placeholderBox->mutableStyleRef().setLogicalWidth(Length(contentLogicalWidth
() - placeholderBox->borderAndPaddingLogicalWidth(), Fixed)); | 97 placeholderBox->mutableStyleRef().setLogicalWidth(Length(contentLogicalWidth
() - placeholderBox->borderAndPaddingLogicalWidth(), Fixed)); |
| 98 placeholderBox->layoutIfNeeded(); | 98 placeholderBox->layoutIfNeeded(); |
| 99 placeholderBox->setX(borderLeft() + paddingLeft()); | 99 placeholderBox->setX(borderLeft() + paddingLeft()); |
| 100 placeholderBox->setY(borderTop() + paddingTop()); | 100 placeholderBox->setY(borderTop() + paddingTop()); |
| 101 return placeholderLayoutObject; | 101 return placeholderLayoutObject; |
| 102 } | 102 } |
| 103 | 103 |
| 104 } | 104 } |
| OLD | NEW |