Fix regression caused by r178354 where options in optgroup not indented

Source/core/html/HTMLOptionElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 312 matching lines @@
 {
     if (ownElementDisabled())
         return true;
     if (Element* parent = parentElement())
         return isHTMLOptGroupElement(*parent) && parent->isDisabledFormControl();
     return false;
 }
 
 Node::InsertionNotificationRequest HTMLOptionElement::insertedInto(ContainerNode* insertionPoint)
 {
+    HTMLElement::insertedInto(insertionPoint);
     if (HTMLSelectElement* select = ownerSelectElement()) {
         select->setRecalcListItems();
-        // Do not call selected() since calling updateListItemSelectedStates()
-        // at this time won't do the right thing. (Why, exactly?)
-        if (m_isSelected) {
-            // FIXME: Might be better to call this unconditionally, always
-            // passing m_isSelected, rather than only calling it if we are
-            // selected.
-            select->optionSelectionStateChanged(this, true);
-            select->scrollToSelection();
-        }
+        select->optionInserted(*this, m_isSelected);
     }
-
-    return HTMLElement::insertedInto(insertionPoint);
+    return InsertionDone;
 }
 
 void HTMLOptionElement::removedFrom(ContainerNode* insertionPoint)
 {
     if (HTMLSelectElement* select = Traversal<HTMLSelectElement>::firstAncestorOrSelf(*insertionPoint)) {
         select->setRecalcListItems();
         select->optionRemoved(*this);
     }
     HTMLElement::removedFrom(insertionPoint);
 }
@@ skipping 22 matching lines @@
 }
 
 void HTMLOptionElement::didAddUserAgentShadowRoot(ShadowRoot& root)
 {
     updateLabel();
 }
 
 void HTMLOptionElement::updateLabel()
 {
     if (ShadowRoot* root = userAgentShadowRoot())
-        root->setTextContent(textIndentedToRespectGroupLabel());
+        root->setTextContent(text());
 }
 
 bool HTMLOptionElement::spatialNavigationFocused() const
 {
     HTMLSelectElement* select = ownerSelectElement();
     if (!select || !select->focused())
         return false;
     return select->spatialNavigationFocusedOption() == this;
 }
 
 bool HTMLOptionElement::isDisplayNone() const
 {
     // If m_style is not set, then the node is still unattached.
     // We have to wait till it gets attached to read the display property.
     if (!m_style)
         return false;
 
     if (m_style->display() != NONE) {
         Element* parent = parentElement();
         ASSERT(parent);
         if (isHTMLOptGroupElement(*parent)) {
             RenderStyle* parentStyle = parent->renderStyle() ? parent->renderStyle() : parent->computedStyle();
             return !parentStyle || parentStyle->display() == NONE;
         }
     }
     return m_style->display() == NONE;
 }
 
 } // namespace blink