SELECT element: Add HTMLSelectElement::selectedListIndex().

third_party/WebKit/Source/web/ExternalPopupMenu.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 246 matching lines @@
         }
         popupItem.enabled = !itemElement.isDisabledFormControl();
         const ComputedStyle& style = *ownerElement.itemComputedStyle(itemElement);
         popupItem.textDirection = toWebTextDirection(style.direction());
         popupItem.hasTextDirectionOverride = isOverride(style.unicodeBidi());
     }
 
     const ComputedStyle& menuStyle = ownerElement.computedStyle() ? *ownerElement.computedStyle() : *ownerElement.ensureComputedStyle();
     info.itemHeight = menuStyle.font().getFontMetrics().height();
     info.itemFontSize = static_cast<int>(menuStyle.font().getFontDescription().computedSize());
-    info.selectedIndex = toExternalPopupMenuItemIndex(ownerElement.optionToListIndex(ownerElement.selectedIndex()), ownerElement);
+    info.selectedIndex = toExternalPopupMenuItemIndex(ownerElement.selectedListIndex(), ownerElement);
     info.rightAligned = menuStyle.direction() == RTL;
     info.allowMultipleSelection = ownerElement.multiple();
     if (count < itemCount)
         items.shrink(count);
     info.items = items;
 
 }
 
 int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex, HTMLSelectElement& ownerElement)
 {
@@ skipping 22 matching lines @@
         if (ownerElement.itemIsDisplayNone(*items[i]))
             continue;
         if (popupMenuItemIndex == i)
             return indexTracker;
         ++indexTracker;
     }
     return -1;
 }
 
 } // namespace blink