SELECT element: Fix a DCHECK failure in optionToBeShown().

third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/html/HTMLSelectElement.h"
 
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/forms/FormController.h"
@@ skipping 84 matching lines @@
     ASSERT_FALSE(opt2->selected());
     ASSERT_FALSE(opt3->selected());
 
     // Restore
     select->restoreFormControlState(selectState);
     EXPECT_FALSE(opt0->selected());
     EXPECT_TRUE(opt2->selected());
     EXPECT_TRUE(opt3->selected());
 }
 
+TEST_F(HTMLSelectElementTest, RestoreUnmatchedFormControlState)
+{
+    // We had a bug that selectedOption() and m_lastOnChangeOption were
+    // mismatched in optionToBeShown(). It happened when
+    // restoreFormControlState() couldn't find matched OPTIONs.
+    // crbug.com/627833.
+
+    document().documentElement()->setInnerHTML("<select id='sel'>"
+        "<option selected>Default</option>"
+        "<option id='2'>222</option>"
+        "</select>", ASSERT_NO_EXCEPTION);
+    document().view()->updateAllLifecyclePhases();
+    Element* element = document().getElementById("sel");
+    HTMLFormControlElementWithState* select = toHTMLSelectElement(element);
+    HTMLOptionElement* opt2 = toHTMLOptionElement(document().getElementById("2"));
+
+    toHTMLSelectElement(element)->setSelectedIndex(1);
+    // Save the current state.
+    FormControlState selectState = select->saveFormControlState();
+    EXPECT_EQ(2U, selectState.valueSize());
+
+    // Reset the status.
+    select->reset();
+    ASSERT_FALSE(opt2->selected());
+    element->removeChild(opt2);
+
+    // Restore
+    select->restoreFormControlState(selectState);
+    EXPECT_EQ(-1, toHTMLSelectElement(element)->selectedIndex());
+    EXPECT_EQ(nullptr, toHTMLSelectElement(element)->optionToBeShown());
+}
+
 TEST_F(HTMLSelectElementTest, ElementRectRelativeToViewport)
 {
     document().documentElement()->setInnerHTML("<select style='position:fixed; top:12.3px; height:24px; -webkit-appearance:none;'><option>o1</select>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
     HTMLSelectElement* select = toHTMLSelectElement(document().body()->firstChild());
     ASSERT(select);
     IntRect bounds = select->elementRectRelativeToViewport();
     EXPECT_EQ(24, bounds.height());
 }
 
@@ skipping 229 matching lines @@
 TEST_F(HTMLSelectElementTest, SetRecalcListItemsByOptgroupRemoval)
 {
     document().documentElement()->setInnerHTML("<select><optgroup><option>sub1</option><option>sub2</option></optgroup></select>", ASSERT_NO_EXCEPTION);
     document().view()->updateAllLifecyclePhases();
     HTMLSelectElement* select = toHTMLSelectElement(document().body()->firstChild());
     select->setInnerHTML("", ASSERT_NO_EXCEPTION);
     // PASS if setInnerHTML didn't have a check failure.
 }
 
 } // namespace blink