Correct elementMatches filter for datalist.options

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

 /*
  * 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, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
@@ skipping 1540 matching lines @@
 
   return toHTMLDataListElement(element);
 }
 
 bool HTMLInputElement::hasValidDataListOptions() const {
   HTMLDataListElement* dataList = this->dataList();
   if (!dataList)
     return false;
   HTMLDataListOptionsCollection* options = dataList->options();
   for (unsigned i = 0; HTMLOptionElement* option = options->item(i); ++i) {
-    if (isValidValue(option->value()))
+    if (!option->value().isEmpty() && !option->isDisabledFormControl() &&
+        isValidValue(option->value()))
       return true;
   }
   return false;
 }
 
 HeapVector<Member<HTMLOptionElement>>
 HTMLInputElement::filteredDataListOptions() const {
   HeapVector<Member<HTMLOptionElement>> filtered;
   HTMLDataListElement* dataList = this->dataList();
   if (!dataList)
@@ skipping 14 matching lines @@
     HTMLOptionElement* option = options->item(i);
     DCHECK(option);
     if (!value.isEmpty()) {
       // Firefox shows OPTIONs with matched labels, Edge shows OPTIONs
       // with matches values. We show both.
       if (option->value().foldCase().find(value) == kNotFound &&
           option->label().foldCase().find(value) == kNotFound)
         continue;
     }
     // TODO(tkent): Should allow invalid strings. crbug.com/607097.
-    if (!isValidValue(option->value()))
+    if (option->value().isEmpty() || option->isDisabledFormControl() ||
+        !isValidValue(option->value()))
       continue;
     filtered.push_back(option);
   }
   return filtered;
 }
 
 void HTMLInputElement::setListAttributeTargetObserver(
     ListAttributeTargetObserver* newObserver) {
   if (m_listAttributeTargetObserver)
     m_listAttributeTargetObserver->unregister();
@@ skipping 202 matching lines @@
   }
 
   parameters.anchorRectInScreen =
       document().view()->contentsToScreen(pixelSnappedBoundingBox());
   parameters.doubleValue = m_inputType->valueAsDouble();
   parameters.isAnchorElementRTL =
       m_inputTypeView->computedTextDirection() == TextDirection::kRtl;
   if (HTMLDataListElement* dataList = this->dataList()) {
     HTMLDataListOptionsCollection* options = dataList->options();
     for (unsigned i = 0; HTMLOptionElement* option = options->item(i); ++i) {
-      if (!isValidValue(option->value()))
+      if (option->value().isEmpty() || option->isDisabledFormControl() ||
+          !isValidValue(option->value()))
         continue;
       DateTimeSuggestion suggestion;
       suggestion.value =
           m_inputType->parseToNumber(option->value(), Decimal::nan())
               .toDouble();
       if (std::isnan(suggestion.value))
         continue;
       suggestion.localizedValue = localizeValue(option->value());
       suggestion.label =
           option->value() == option->label() ? String() : option->label();
@@ skipping 50 matching lines @@
 
 bool HTMLInputElement::hasFallbackContent() const {
   return m_inputTypeView->hasFallbackContent();
 }
 
 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths) {
   return m_inputType->setFilesFromPaths(paths);
 }
 
 }  // namespace blink