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

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

Issue 236203020: Separate repaint and layout requirements of StyleDifference (Step 1) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase; Renaming of some methods and small changes in StyleDifference Created 6 years, 8 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010 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 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 if (RenderObject* viewPortRenderer = viewPort ? viewPort->renderer() : 0) { 231 if (RenderObject* viewPortRenderer = viewPort ? viewPort->renderer() : 0) {
232 viewPortRenderer->style()->setHeight(Length()); 232 viewPortRenderer->style()->setHeight(Length());
233 viewPortRenderer->style()->setWidth(Length()); 233 viewPortRenderer->style()->setWidth(Length());
234 } 234 }
235 Element* container = containerElement(); 235 Element* container = containerElement();
236 if (RenderObject* containerRenderer = container ? container->renderer() : 0) { 236 if (RenderObject* containerRenderer = container ? container->renderer() : 0) {
237 containerRenderer->style()->setHeight(Length()); 237 containerRenderer->style()->setHeight(Length());
238 containerRenderer->style()->setWidth(Length()); 238 containerRenderer->style()->setWidth(Length());
239 } 239 }
240 RenderObject* innerTextRenderer = innerTextElement()->renderer(); 240 RenderObject* innerTextRenderer = innerTextElement()->renderer();
241 if (innerTextRenderer && diff == StyleDifferenceLayout) 241 if (innerTextRenderer && diff.needsFullLayout())
242 innerTextRenderer->setNeedsLayout(); 242 innerTextRenderer->setNeedsLayout();
243 if (HTMLElement* placeholder = inputElement()->placeholderElement()) 243 if (HTMLElement* placeholder = inputElement()->placeholderElement())
244 placeholder->setInlineStyleProperty(CSSPropertyTextOverflow, textShouldB eTruncated() ? CSSValueEllipsis : CSSValueClip); 244 placeholder->setInlineStyleProperty(CSSPropertyTextOverflow, textShouldB eTruncated() ? CSSValueEllipsis : CSSValueClip);
245 setHasOverflowClip(false); 245 setHasOverflowClip(false);
246 } 246 }
247 247
248 void RenderTextControlSingleLine::capsLockStateMayHaveChanged() 248 void RenderTextControlSingleLine::capsLockStateMayHaveChanged()
249 { 249 {
250 if (!node()) 250 if (!node())
251 return; 251 return;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 if (innerTextElement()) 421 if (innerTextElement())
422 innerTextElement()->setScrollTop(newTop); 422 innerTextElement()->setScrollTop(newTop);
423 } 423 }
424 424
425 HTMLInputElement* RenderTextControlSingleLine::inputElement() const 425 HTMLInputElement* RenderTextControlSingleLine::inputElement() const
426 { 426 {
427 return toHTMLInputElement(node()); 427 return toHTMLInputElement(node());
428 } 428 }
429 429
430 } 430 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698