Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: Source/core/rendering/RenderTextControl.cpp

Issue 152623002: Make StyleChange parameter explicit in setNeedsStyleRecalc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/svg/SVGAElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 Element* innerText = innerTextElement(); 69 Element* innerText = innerTextElement();
70 if (!innerText) 70 if (!innerText)
71 return; 71 return;
72 RenderBlock* innerTextRenderer = toRenderBlock(innerText->renderer()); 72 RenderBlock* innerTextRenderer = toRenderBlock(innerText->renderer());
73 if (innerTextRenderer) { 73 if (innerTextRenderer) {
74 // We may have set the width and the height in the old style in layout() . 74 // We may have set the width and the height in the old style in layout() .
75 // Reset them now to avoid getting a spurious layout hint. 75 // Reset them now to avoid getting a spurious layout hint.
76 innerTextRenderer->style()->setHeight(Length()); 76 innerTextRenderer->style()->setHeight(Length());
77 innerTextRenderer->style()->setWidth(Length()); 77 innerTextRenderer->style()->setWidth(Length());
78 innerTextRenderer->setStyle(createInnerTextStyle(style())); 78 innerTextRenderer->setStyle(createInnerTextStyle(style()));
79 innerText->setNeedsStyleRecalc(); 79 innerText->setNeedsStyleRecalc(SubtreeStyleChange);
80 } 80 }
81 textFormControlElement()->updatePlaceholderVisibility(false); 81 textFormControlElement()->updatePlaceholderVisibility(false);
82 } 82 }
83 83
84 static inline void updateUserModifyProperty(HTMLTextFormControlElement* node, Re nderStyle* style) 84 static inline void updateUserModifyProperty(HTMLTextFormControlElement* node, Re nderStyle* style)
85 { 85 {
86 style->setUserModify(node->isDisabledOrReadOnly() ? READ_ONLY : READ_WRITE_P LAINTEXT_ONLY); 86 style->setUserModify(node->isDisabledOrReadOnly() ? READ_ONLY : READ_WRITE_P LAINTEXT_ONLY);
87 } 87 }
88 88
89 void RenderTextControl::adjustInnerTextStyle(RenderStyle* textBlockStyle) const 89 void RenderTextControl::adjustInnerTextStyle(RenderStyle* textBlockStyle) const
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder Element(); 289 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder Element();
290 RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0; 290 RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
291 if (!placeholderRenderer) 291 if (!placeholderRenderer)
292 return 0; 292 return 0;
293 if (relayoutChildren) 293 if (relayoutChildren)
294 layoutScope.setChildNeedsLayout(placeholderRenderer); 294 layoutScope.setChildNeedsLayout(placeholderRenderer);
295 return placeholderRenderer; 295 return placeholderRenderer;
296 } 296 }
297 297
298 } // namespace WebCore 298 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/svg/SVGAElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698