Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLOptionElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
index cb09129..90a3895 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
@@ -53,7 +53,6 @@ HTMLOptionElement::HTMLOptionElement(Document& document)
     , m_isSelected(false)
 {
     setHasCustomStyleCallbacks();
-    ScriptWrappable::init(this);
 }
 
 HTMLOptionElement::~HTMLOptionElement()
@@ -133,11 +132,9 @@ void HTMLOptionElement::setText(const String &text, ExceptionState& exceptionSta
     bool selectIsMenuList = select && select->usesMenuList();
     int oldSelectedIndex = selectIsMenuList ? select->selectedIndex() : -1;
 
-    // Handle the common special case where there's exactly 1 child node, and it's a text node.
-    Node* child = firstChild();
-    if (child && child->isTextNode() && !child->nextSibling())
-        toText(child)->setData(text);
-    else {
+    if (hasOneTextChild()) {
+        toText(firstChild())->setData(text);
+    } else {
         removeChildren();
         appendChild(Text::create(document(), text), exceptionState);
     }
@@ -162,7 +159,7 @@ int HTMLOptionElement::index() const
 
     int optionIndex = 0;
 
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& items = selectElement->listItems();
+    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& items = selectElement->listItems();
     size_t length = items.size();
     for (size_t i = 0; i < length; ++i) {
         if (!isHTMLOptionElement(*items[i]))
@@ -184,7 +181,8 @@ void HTMLOptionElement::parseAttribute(const QualifiedName& name, const AtomicSt
         bool oldDisabled = m_disabled;
         m_disabled = !value.isNull();
         if (oldDisabled != m_disabled) {
-            didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
+            pseudoStateChanged(CSSSelector::PseudoDisabled);
+            pseudoStateChanged(CSSSelector::PseudoEnabled);
             if (renderer() && renderer()->style()->hasAppearance())
                 RenderTheme::theme().stateChanged(renderer(), EnabledControlState);
         }
@@ -244,7 +242,7 @@ void HTMLOptionElement::setSelectedState(bool selected)
         return;
 
     m_isSelected = selected;
-    didAffectSelector(AffectedSelectorChecked);
+    pseudoStateChanged(CSSSelector::PseudoChecked);
 
     if (HTMLSelectElement* select = ownerSelectElement())
         select->invalidateSelectedItems();
@@ -309,7 +307,7 @@ void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change)
     // FIXME: We ask our owner select to repaint regardless of which property changed.
     if (HTMLSelectElement* select = ownerSelectElement()) {
         if (RenderObject* renderer = select->renderer())
-            renderer->paintInvalidationForWholeRenderer();
+            renderer->setShouldDoFullPaintInvalidation();
     }
 }
 
@@ -377,7 +375,7 @@ HTMLFormElement* HTMLOptionElement::form() const
     if (HTMLSelectElement* selectElement = ownerSelectElement())
         return selectElement->formOwner();
 
-    return 0;
+    return nullptr;
 }
 
 void HTMLOptionElement::didAddUserAgentShadowRoot(ShadowRoot& root)