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

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

Issue 23668002: Avoid leaking ThreadingPrimitives.h from StackStats.h when collection is off. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } 83 }
84 } 84 }
85 85
86 LayoutUnit RenderTextControlSingleLine::computeLogicalHeightLimit() const 86 LayoutUnit RenderTextControlSingleLine::computeLogicalHeightLimit() const
87 { 87 {
88 return containerElement() ? contentLogicalHeight() : logicalHeight(); 88 return containerElement() ? contentLogicalHeight() : logicalHeight();
89 } 89 }
90 90
91 void RenderTextControlSingleLine::layout() 91 void RenderTextControlSingleLine::layout()
92 { 92 {
93 StackStats::LayoutCheckPoint layoutCheckPoint;
94 SubtreeLayoutScope layoutScope(this); 93 SubtreeLayoutScope layoutScope(this);
95 94
96 // FIXME: We should remove the height-related hacks in layout() and 95 // FIXME: We should remove the height-related hacks in layout() and
97 // styleDidChange(). We need them because 96 // styleDidChange(). We need them because
98 // - Center the inner elements vertically if the input height is taller than 97 // - Center the inner elements vertically if the input height is taller than
99 // the intrinsic height of the inner elements. 98 // the intrinsic height of the inner elements.
100 // - Shrink the inner elment heights if the input height is samller than the 99 // - Shrink the inner elment heights if the input height is samller than the
101 // intrinsic heights of the inner elements. 100 // intrinsic heights of the inner elements.
102 101
103 // We don't honor paddings and borders for textfields without decorations 102 // We don't honor paddings and borders for textfields without decorations
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 if (innerTextElement()) 424 if (innerTextElement())
426 innerTextElement()->setScrollTop(newTop); 425 innerTextElement()->setScrollTop(newTop);
427 } 426 }
428 427
429 HTMLInputElement* RenderTextControlSingleLine::inputElement() const 428 HTMLInputElement* RenderTextControlSingleLine::inputElement() const
430 { 429 {
431 return toHTMLInputElement(node()); 430 return toHTMLInputElement(node());
432 } 431 }
433 432
434 } 433 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTableSection.cpp ('k') | Source/core/rendering/RenderTextTrackCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698