Source/core/layout/LayoutTextControl.cpp - Issue 1269123002: Preparation for combining paths of focus rings and outlines

Side by Side Diff: Source/core/layout/LayoutTextControl.cpp

Issue 1269123002: Preparation for combining paths of focus rings and outlines (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Remove debug from fast/css/focus-ring-recursive-continuations.html Created 5 years, 4 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

« LayoutTests/platform/linux/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt ('K') | « Source/core/layout/LayoutTextControl.h ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 263 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
274 }	274 }

275	275

276 LayoutUnit toAdd = borderAndPaddingLogicalWidth();	276 LayoutUnit toAdd = borderAndPaddingLogicalWidth();

277	277

278 m_minPreferredLogicalWidth += toAdd;	278 m_minPreferredLogicalWidth += toAdd;

279 m_maxPreferredLogicalWidth += toAdd;	279 m_maxPreferredLogicalWidth += toAdd;

280	280

281 clearPreferredLogicalWidthsDirty();	281 clearPreferredLogicalWidthsDirty();

282 }	282 }

283	283

284 void LayoutTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const Layou tPoint& additionalOffset) const	284 void LayoutTextControl::addOutlineRects(Vector<LayoutRect>& rects, const LayoutP oint& additionalOffset) const

285 {	285 {

286 if (!size().isEmpty())	286 if (!size().isEmpty())

287 rects.append(LayoutRect(additionalOffset, size()));	287 rects.append(LayoutRect(additionalOffset, size()));

288 }	288 }

289	289

290 LayoutObject* LayoutTextControl::layoutSpecialExcludedChild(bool relayoutChildre n, SubtreeLayoutScope& layoutScope)	290 LayoutObject* LayoutTextControl::layoutSpecialExcludedChild(bool relayoutChildre n, SubtreeLayoutScope& layoutScope)

291 {	291 {

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