Use union types for HTMLSelectElement.add()'s arguments

Source/core/html/HTMLSelectElement.cpp

 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
@@ skipping 13 matching lines @@
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/html/HTMLSelectElement.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
+#include "bindings/core/v8/UnionTypesCore.h"
 #include "core/HTMLNames.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/NodeListsNodeData.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
@@ skipping 160 matching lines @@
     return optionToListIndex(selectedIndex());
 }
 
 int HTMLSelectElement::activeSelectionEndListIndex() const
 {
     if (m_activeSelectionEndIndex >= 0)
         return m_activeSelectionEndIndex;
     return lastSelectedListIndex();
 }
 
-void HTMLSelectElement::add(HTMLElement* element, HTMLElement* before, ExceptionState& exceptionState)
+void HTMLSelectElement::add(const HTMLOptionElementOrHTMLOptGroupElement& element, const HTMLElementOrLong& before, ExceptionState& exceptionState)
 {
-    // Make sure the element is ref'd and deref'd so we don't leak it.
-    RefPtrWillBeRawPtr<HTMLElement> protectNewChild(element);
+    RefPtrWillBeRawPtr<HTMLElement> elementToInsert;
+    ASSERT(!element.isNull());
+    if (element.isHTMLOptionElement())
+        elementToInsert = element.getAsHTMLOptionElement();
+    else
+        elementToInsert = element.getAsHTMLOptGroupElement();
 
-    if (!element || !(isHTMLOptionElement(element) || isHTMLOptGroupElement(element) || isHTMLHRElement(element)))
-        return;
+    RefPtrWillBeRawPtr<HTMLElement> beforeElement;
+    if (before.isHTMLElement())
+        beforeElement = before.getAsHTMLElement();
+    else if (before.isLong())
+        beforeElement = options()->item(before.getAsLong());
+    else
+        beforeElement = nullptr;
 
-    insertBefore(element, before, exceptionState);
+    insertBefore(elementToInsert, beforeElement.get(), exceptionState);
     setNeedsValidityCheck();
 }
 
-void HTMLSelectElement::addBeforeOptionAtIndex(HTMLElement* element, int beforeIndex, ExceptionState& exceptionState)
-{
-    HTMLOptionElement* beforeElement = options()->item(beforeIndex);
-    add(element, beforeElement, exceptionState);
-}
-
 void HTMLSelectElement::remove(int optionIndex)
 {
     int listIndex = optionToListIndex(optionIndex);
     if (listIndex < 0)
         return;
 
     listItems()[listIndex]->remove(IGNORE_EXCEPTION);
 }
 
 String HTMLSelectElement::value() const
@@ skipping 216 matching lines @@
 HTMLOptionElement* HTMLSelectElement::item(unsigned index)
 {
     return options()->item(index);
 }
 
 void HTMLSelectElement::setOption(unsigned index, HTMLOptionElement* option, ExceptionState& exceptionState)
 {
     if (index > maxSelectItems - 1)
         index = maxSelectItems - 1;
     int diff = index - length();
-    RefPtrWillBeRawPtr<HTMLOptionElement> before = nullptr;
+    HTMLOptionElementOrHTMLOptGroupElement element;
+    element.setHTMLOptionElement(option);
+    HTMLElementOrLong before;
     // Out of array bounds? First insert empty dummies.
     if (diff > 0) {
         setLength(index, exceptionState);
         // Replace an existing entry?
     } else if (diff < 0) {
-        before = options()->item(index + 1);
+        before.setHTMLElement(options()->item(index + 1));
         remove(index);
     }
     // Finally add the new element.
     if (!exceptionState.hadException()) {
-        add(option, before.get(), exceptionState);
+        add(element, before, exceptionState);
         if (diff >= 0 && option->selected())
             optionSelectionStateChanged(option, true);
     }
 }
 
 void HTMLSelectElement::setLength(unsigned newLen, ExceptionState& exceptionState)
 {
     if (newLen > maxSelectItems)
         newLen = maxSelectItems;
     int diff = length() - newLen;
 
     if (diff < 0) { // Add dummy elements.
         do {
             RefPtrWillBeRawPtr<Element> option = document().createElement(optionTag, false);
-            ASSERT(option);
-            add(toHTMLElement(option), 0, exceptionState);
+            HTMLOptionElementOrHTMLOptGroupElement element;
+            element.setHTMLOptionElement(toHTMLOptionElement(option));
+            add(element, HTMLElementOrLong(), exceptionState);

[Jens Widell, 2014/11/11 12:08:44]

Could simplify a bit by using appendChild() instead here. All add() brings in
addition is a setNeedsValidityCheck() call, and we have one in this function too
already.

             if (exceptionState.hadException())
                 break;
         } while (++diff);
     } else {
         const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& items = listItems();
 
         // Removing children fires mutation events, which might mutate the DOM further, so we first copy out a list
         // of elements that we intend to remove then attempt to remove them one at a time.
         WillBeHeapVector<RefPtrWillBeMember<Element>> itemsToRemove;
         size_t optionIndex = 0;
@@ skipping 1264 matching lines @@
     int focusedIndex = activeSelectionEndListIndex();
     if (focusedIndex < 0)
         focusedIndex = firstSelectableListIndex();
     if (focusedIndex < 0)
         return nullptr;
     HTMLElement* focused = listItems()[focusedIndex];
     return isHTMLOptionElement(focused) ? toHTMLOptionElement(focused) : nullptr;
 }
 
 } // namespace