Revert of HTMLSelectElement does not include selected index/indices while saving state

Source/core/html/HTMLSelectElement.cpp

Index: Source/core/html/HTMLSelectElement.cpp
diff --git a/Source/core/html/HTMLSelectElement.cpp b/Source/core/html/HTMLSelectElement.cpp
index 6e6b89fd0b8cc19ba3ae479245182f9d373b3d93..906812120075f2065568cbede9200c54123b4cd9 100644
--- a/Source/core/html/HTMLSelectElement.cpp
+++ b/Source/core/html/HTMLSelectElement.cpp
@@ -1039,7 +1039,6 @@
         if (!option->selected())
             continue;
         state.append(option->value());
-        state.append(String::number(i));
         if (!multiple())
             break;
     }
@@ -1074,34 +1073,21 @@
         toHTMLOptionElement(items[i])->setSelectedState(false);
     }
 
-    // The saved state should have at least one value and an index.
-    ASSERT(state.valueSize() >= 2);
     if (!multiple()) {
-        size_t index = state[1].toUInt();
-        if (index < itemsSize && isHTMLOptionElement(items[index]) && toHTMLOptionElement(items[index])->value() == state[0]) {
-            toHTMLOptionElement(items[index])->setSelectedState(true);
-        } else {
-            size_t foundIndex = searchOptionsForValue(state[0], 0, itemsSize);
-            if (foundIndex != kNotFound)
-                toHTMLOptionElement(items[foundIndex])->setSelectedState(true);
-        }
+        size_t foundIndex = searchOptionsForValue(state[0], 0, itemsSize);
+        if (foundIndex != kNotFound)
+            toHTMLOptionElement(items[foundIndex])->setSelectedState(true);
     } else {
         size_t startIndex = 0;
-        for (size_t i = 0; i < state.valueSize(); i+= 2) {
+        for (size_t i = 0; i < state.valueSize(); ++i) {
             const String& value = state[i];
-            const size_t index = state[i + 1].toUInt();
-            if (index < itemsSize && isHTMLOptionElement(items[index]) && toHTMLOptionElement(items[index])->value() == value) {
-                toHTMLOptionElement(items[index])->setSelectedState(true);
-                startIndex = index + 1;
-            } else {
-                size_t foundIndex = searchOptionsForValue(value, startIndex, itemsSize);
-                if (foundIndex == kNotFound)
-                    foundIndex = searchOptionsForValue(value, 0, startIndex);
-                if (foundIndex == kNotFound)
-                    continue;
-                toHTMLOptionElement(items[foundIndex])->setSelectedState(true);
-                startIndex = foundIndex + 1;
-            }
+            size_t foundIndex = searchOptionsForValue(value, startIndex, itemsSize);
+            if (foundIndex == kNotFound)
+                foundIndex = searchOptionsForValue(value, 0, startIndex);
+            if (foundIndex == kNotFound)
+                continue;
+            toHTMLOptionElement(items[foundIndex])->setSelectedState(true);
+            startIndex = foundIndex + 1;
         }
     }