| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 LayoutUnit LayoutTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li
neHeight, LayoutUnit nonContentHeight) const | 68 LayoutUnit LayoutTextControlMultiLine::computeControlLogicalHeight(LayoutUnit li
neHeight, LayoutUnit nonContentHeight) const |
| 69 { | 69 { |
| 70 return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight
; | 70 return lineHeight * toHTMLTextAreaElement(node())->rows() + nonContentHeight
; |
| 71 } | 71 } |
| 72 | 72 |
| 73 int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool
firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons
t | 73 int LayoutTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool
firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) cons
t |
| 74 { | 74 { |
| 75 return LayoutBox::baselinePosition(baselineType, firstLine, direction, lineP
ositionMode); | 75 return LayoutBox::baselinePosition(baselineType, firstLine, direction, lineP
ositionMode); |
| 76 } | 76 } |
| 77 | 77 |
| 78 PassRefPtr<LayoutStyle> LayoutTextControlMultiLine::createInnerEditorStyle(const
LayoutStyle& startStyle) const | 78 PassRefPtr<ComputedStyle> LayoutTextControlMultiLine::createInnerEditorStyle(con
st ComputedStyle& startStyle) const |
| 79 { | 79 { |
| 80 RefPtr<LayoutStyle> textBlockStyle = LayoutStyle::create(); | 80 RefPtr<ComputedStyle> textBlockStyle = ComputedStyle::create(); |
| 81 textBlockStyle->inheritFrom(startStyle); | 81 textBlockStyle->inheritFrom(startStyle); |
| 82 adjustInnerEditorStyle(*textBlockStyle); | 82 adjustInnerEditorStyle(*textBlockStyle); |
| 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* placeholderRenderer = LayoutTextControl::layoutSpecialExcluded
Child(relayoutChildren, layoutScope); | 91 LayoutObject* placeholderRenderer = LayoutTextControl::layoutSpecialExcluded
Child(relayoutChildren, layoutScope); |
| 92 if (!placeholderRenderer) | 92 if (!placeholderRenderer) |
| 93 return 0; | 93 return 0; |
| 94 if (!placeholderRenderer->isBox()) | 94 if (!placeholderRenderer->isBox()) |
| 95 return placeholderRenderer; | 95 return placeholderRenderer; |
| 96 LayoutBox* placeholderBox = toLayoutBox(placeholderRenderer); | 96 LayoutBox* placeholderBox = toLayoutBox(placeholderRenderer); |
| 97 placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - plac
eholderBox->borderAndPaddingLogicalWidth(), Fixed)); | 97 placeholderBox->style()->setLogicalWidth(Length(contentLogicalWidth() - plac
eholderBox->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 placeholderRenderer; | 101 return placeholderRenderer; |
| 102 } | 102 } |
| 103 | 103 |
| 104 } | 104 } |
| OLD | NEW |