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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 return; | 70 return; |
71 LayoutBlock* innerEditorLayoutObject = toLayoutBlock(innerEditor->layoutObje
ct()); | 71 LayoutBlock* innerEditorLayoutObject = toLayoutBlock(innerEditor->layoutObje
ct()); |
72 if (innerEditorLayoutObject) { | 72 if (innerEditorLayoutObject) { |
73 // We may have set the width and the height in the old style in layout()
. | 73 // We may have set the width and the height in the old style in layout()
. |
74 // Reset them now to avoid getting a spurious layout hint. | 74 // Reset them now to avoid getting a spurious layout hint. |
75 innerEditorLayoutObject->mutableStyleRef().setHeight(Length()); | 75 innerEditorLayoutObject->mutableStyleRef().setHeight(Length()); |
76 innerEditorLayoutObject->mutableStyleRef().setWidth(Length()); | 76 innerEditorLayoutObject->mutableStyleRef().setWidth(Length()); |
77 innerEditorLayoutObject->setStyle(createInnerEditorStyle(styleRef())); | 77 innerEditorLayoutObject->setStyle(createInnerEditorStyle(styleRef())); |
78 innerEditor->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonFo
rTracing::create(StyleChangeReason::Control)); | 78 innerEditor->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonFo
rTracing::create(StyleChangeReason::Control)); |
79 } | 79 } |
80 textFormControlElement()->updatePlaceholderVisibility(false); | 80 textFormControlElement()->updatePlaceholderVisibility(); |
81 } | 81 } |
82 | 82 |
83 static inline void updateUserModifyProperty(HTMLTextFormControlElement& node, Co
mputedStyle& style) | 83 static inline void updateUserModifyProperty(HTMLTextFormControlElement& node, Co
mputedStyle& style) |
84 { | 84 { |
85 style.setUserModify(node.isDisabledOrReadOnly() ? READ_ONLY : READ_WRITE_PLA
INTEXT_ONLY); | 85 style.setUserModify(node.isDisabledOrReadOnly() ? READ_ONLY : READ_WRITE_PLA
INTEXT_ONLY); |
86 } | 86 } |
87 | 87 |
88 void LayoutTextControl::adjustInnerEditorStyle(ComputedStyle& textBlockStyle) co
nst | 88 void LayoutTextControl::adjustInnerEditorStyle(ComputedStyle& textBlockStyle) co
nst |
89 { | 89 { |
90 // The inner block, if present, always has its direction set to LTR, | 90 // The inner block, if present, always has its direction set to LTR, |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder
Element(); | 292 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder
Element(); |
293 LayoutObject* placeholderLayoutObject = placeholder ? placeholder->layoutObj
ect() : nullptr; | 293 LayoutObject* placeholderLayoutObject = placeholder ? placeholder->layoutObj
ect() : nullptr; |
294 if (!placeholderLayoutObject) | 294 if (!placeholderLayoutObject) |
295 return nullptr; | 295 return nullptr; |
296 if (relayoutChildren) | 296 if (relayoutChildren) |
297 layoutScope.setChildNeedsLayout(placeholderLayoutObject); | 297 layoutScope.setChildNeedsLayout(placeholderLayoutObject); |
298 return placeholderLayoutObject; | 298 return placeholderLayoutObject; |
299 } | 299 } |
300 | 300 |
301 } // namespace blink | 301 } // namespace blink |
OLD | NEW |