| Index: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
|
| index e183ae86c67ecc69fcacbebf9695245b02574798..08b47018bed3bdfa1fcbf4ce6f591ace5971c353 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp
|
| @@ -239,8 +239,10 @@ void LayoutTextControl::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidt
|
| // Use average character width. Matches IE.
|
| AtomicString family = style()->font().getFontDescription().family().family();
|
| maxLogicalWidth = preferredContentLogicalWidth(const_cast<LayoutTextControl*>(this)->getAvgCharWidth(family));
|
| - if (LayoutBox* innerEditorLayoutBox = innerEditorElement()->layoutBox())
|
| - maxLogicalWidth += innerEditorLayoutBox->paddingStart() + innerEditorLayoutBox->paddingEnd();
|
| + if (innerEditorElement()) {
|
| + if (LayoutBox* innerEditorLayoutBox = innerEditorElement()->layoutBox())
|
| + maxLogicalWidth += innerEditorLayoutBox->paddingStart() + innerEditorLayoutBox->paddingEnd();
|
| + }
|
| if (!style()->logicalWidth().hasPercent())
|
| minLogicalWidth = maxLogicalWidth;
|
| }
|
|
|