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

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

Issue 711493004: Remove unnecessary paintContainer parameter from addFocusRingRects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 } 276 }
277 277
278 LayoutUnit toAdd = borderAndPaddingLogicalWidth(); 278 LayoutUnit toAdd = borderAndPaddingLogicalWidth();
279 279
280 m_minPreferredLogicalWidth += toAdd; 280 m_minPreferredLogicalWidth += toAdd;
281 m_maxPreferredLogicalWidth += toAdd; 281 m_maxPreferredLogicalWidth += toAdd;
282 282
283 clearPreferredLogicalWidthsDirty(); 283 clearPreferredLogicalWidthsDirty();
284 } 284 }
285 285
286 void RenderTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const Layou tPoint& additionalOffset, const RenderLayerModelObject*) const 286 void RenderTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const Layou tPoint& additionalOffset) const
287 { 287 {
288 if (!size().isEmpty()) 288 if (!size().isEmpty())
289 rects.append(LayoutRect(additionalOffset, size())); 289 rects.append(LayoutRect(additionalOffset, size()));
290 } 290 }
291 291
292 RenderObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildre n, SubtreeLayoutScope& layoutScope) 292 RenderObject* RenderTextControl::layoutSpecialExcludedChild(bool relayoutChildre n, SubtreeLayoutScope& layoutScope)
293 { 293 {
294 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder Element(); 294 HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholder Element();
295 RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0; 295 RenderObject* placeholderRenderer = placeholder ? placeholder->renderer() : 0;
296 if (!placeholderRenderer) 296 if (!placeholderRenderer)
297 return 0; 297 return 0;
298 if (relayoutChildren) 298 if (relayoutChildren)
299 layoutScope.setChildNeedsLayout(placeholderRenderer); 299 layoutScope.setChildNeedsLayout(placeholderRenderer);
300 return placeholderRenderer; 300 return placeholderRenderer;
301 } 301 }
302 302
303 } // namespace blink 303 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698