Chromium Code Reviews| Index: Source/core/html/HTMLTextAreaElement.cpp |
| diff --git a/Source/core/html/HTMLTextAreaElement.cpp b/Source/core/html/HTMLTextAreaElement.cpp |
| index a08935d1e059e54223a8d8549133a9df561e3635..045aa6af4e0df4a322e417aa627ecc6a85a6de0d 100644 |
| --- a/Source/core/html/HTMLTextAreaElement.cpp |
| +++ b/Source/core/html/HTMLTextAreaElement.cpp |
| @@ -161,8 +161,8 @@ void HTMLTextAreaElement::parseAttribute(const QualifiedName& name, const Atomic |
| rows = defaultRows; |
| if (m_rows != rows) { |
| m_rows = rows; |
| - if (renderer()) |
| - renderer()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
| + if (layoutObject()) |
| + layoutObject()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
| } |
| } else if (name == colsAttr) { |
| int cols = 0; |
| @@ -170,8 +170,8 @@ void HTMLTextAreaElement::parseAttribute(const QualifiedName& name, const Atomic |
| cols = defaultCols; |
| if (m_cols != cols) { |
| m_cols = cols; |
| - if (renderer()) |
| - renderer()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
| + if (layoutObject()) |
| + layoutObject()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
|
Julien - ping for review
2015/03/05 16:19:16
It seems like it could be rewritten (as we're touc
dsinclair
2015/03/05 16:40:02
Done.
|
| } |
| } else if (name == wrapAttr) { |
| // The virtual/physical values were a Netscape extension of HTML 3.0, now deprecated. |
| @@ -185,8 +185,8 @@ void HTMLTextAreaElement::parseAttribute(const QualifiedName& name, const Atomic |
| wrap = SoftWrap; |
| if (wrap != m_wrap) { |
| m_wrap = wrap; |
| - if (renderer()) |
| - renderer()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
| + if (layoutObject()) |
| + layoutObject()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
|
Julien - ping for review
2015/03/05 16:19:16
Ditto.
dsinclair
2015/03/05 16:40:01
Done.
|
| } |
| } else if (name == accesskeyAttr) { |
| // ignore for the moment |
| @@ -253,9 +253,9 @@ void HTMLTextAreaElement::updateFocusAppearance(bool restorePreviousSelection) |
| void HTMLTextAreaElement::defaultEventHandler(Event* event) |
| { |
| - if (renderer() && (event->isMouseEvent() || event->isDragEvent() || event->hasInterface(EventNames::WheelEvent) || event->type() == EventTypeNames::blur)) |
| + if (layoutObject() && (event->isMouseEvent() || event->isDragEvent() || event->hasInterface(EventNames::WheelEvent) || event->type() == EventTypeNames::blur)) |
| forwardEvent(event); |
| - else if (renderer() && event->isBeforeTextInsertedEvent()) |
| + else if (layoutObject() && event->isBeforeTextInsertedEvent()) |
| handleBeforeTextInsertedEvent(static_cast<BeforeTextInsertedEvent*>(event)); |
| HTMLTextFormControlElement::defaultEventHandler(event); |
| @@ -287,7 +287,7 @@ void HTMLTextAreaElement::subtreeHasChanged() |
| void HTMLTextAreaElement::handleBeforeTextInsertedEvent(BeforeTextInsertedEvent* event) const |
| { |
| ASSERT(event); |
| - ASSERT(renderer()); |
| + ASSERT(layoutObject()); |
| int signedMaxLength = maxLength(); |
| if (signedMaxLength < 0) |
| return; |