| Index: third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
|
| index a2cca350f1509490173efa3c80d9cf4fb101e60e..61af9561736e44404833ba96970536a157661639 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
|
| @@ -427,7 +427,7 @@ void HTMLSelectElement::optionElementChildrenChanged(const HTMLOptionElement& op
|
| {
|
| setNeedsValidityCheck();
|
|
|
| - if (layoutObject()) {
|
| + if (hasLayoutObject()) {
|
| if (option.selected() && usesMenuList())
|
| layoutObject()->updateFromElement();
|
| if (AXObjectCache* cache = layoutObject()->document().existingAXObjectCache())
|
| @@ -833,7 +833,7 @@ void HTMLSelectElement::setRecalcListItems(HTMLElement& subject)
|
| invalidateSelectedItems();
|
| }
|
|
|
| - if (layoutObject()) {
|
| + if (hasLayoutObject()) {
|
| if (AXObjectCache* cache = layoutObject()->document().existingAXObjectCache())
|
| cache->childrenChanged(this);
|
| }
|
| @@ -1919,7 +1919,7 @@ String HTMLSelectElement::itemText(const Element& element) const
|
| else if (isHTMLOptionElement(element))
|
| itemString = toHTMLOptionElement(element).textIndentedToRespectGroupLabel();
|
|
|
| - if (layoutObject())
|
| + if (hasLayoutObject())
|
| applyTextTransform(layoutObject()->style(), itemString, ' ');
|
| return itemString;
|
| }
|
| @@ -1977,7 +1977,7 @@ void HTMLSelectElement::popupDidHide()
|
| void HTMLSelectElement::setIndexToSelectOnCancel(int listIndex)
|
| {
|
| m_indexToSelectOnCancel = listIndex;
|
| - if (layoutObject())
|
| + if (hasLayoutObject())
|
| layoutObject()->updateFromElement();
|
| }
|
|
|
|
|