| Index: third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| index fe46b410c8acee9582b7f58e4e2e0e5ab34747c9..001e7007085fd3a8abab6a4dad4a27d53d856955 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp
|
| @@ -1,6 +1,7 @@
|
| /**
|
| * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
|
| - * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
|
| + * (C) 2008 Torch Mobile Inc. All rights reserved.
|
| + * (http://www.torchmobile.com/)
|
| * Copyright (C) 2010 Google Inc. All rights reserved.
|
| * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
| *
|
| @@ -153,8 +154,9 @@ void LayoutTextControlSingleLine::layout() {
|
| }
|
| placeholderBox->setLocation(textOffset);
|
|
|
| - // The placeholder gets layout last, after the parent text control and its other children,
|
| - // so in order to get the correct overflow from the placeholder we need to recompute it now.
|
| + // The placeholder gets layout last, after the parent text control and its
|
| + // other children, so in order to get the correct overflow from the
|
| + // placeholder we need to recompute it now.
|
| if (neededLayout)
|
| computeOverflow(clientLogicalBottom());
|
| }
|
| @@ -277,7 +279,8 @@ LayoutUnit LayoutTextControlSingleLine::preferredContentLogicalWidth(
|
| if (LayoutBox* spinLayoutObject =
|
| spinButton ? spinButton->layoutBox() : 0) {
|
| result += spinLayoutObject->borderAndPaddingLogicalWidth();
|
| - // Since the width of spinLayoutObject is not calculated yet, spinLayoutObject->logicalWidth() returns 0.
|
| + // Since the width of spinLayoutObject is not calculated yet,
|
| + // spinLayoutObject->logicalWidth() returns 0.
|
| // So ensureComputedStyle()->logicalWidth() is used instead.
|
| result += spinButton->ensureComputedStyle()->logicalWidth().value();
|
| }
|
|
|