| Index: Source/web/WebSearchableFormData.cpp
|
| diff --git a/Source/web/WebSearchableFormData.cpp b/Source/web/WebSearchableFormData.cpp
|
| index e6cb9e2db0347c8305e0ddf7b71ba7b437ff770c..e23b166cea87218de945a567dc0475c6cd90beea 100644
|
| --- a/Source/web/WebSearchableFormData.cpp
|
| +++ b/Source/web/WebSearchableFormData.cpp
|
| @@ -214,18 +214,17 @@ bool buildSearchString(const HTMLFormElement* form, Vector<char>* encodedString,
|
| if (!control->appendFormData(*dataList, false))
|
| continue;
|
|
|
| - const FormDataList::FormDataListItems& items = dataList->items();
|
| - for (FormDataList::FormDataListItems::const_iterator j(items.begin()); j != items.end(); ++j) {
|
| + for (const FormDataList::Item& item : dataList->items()) {
|
| if (!encodedString->isEmpty())
|
| encodedString->append('&');
|
| - FormDataBuilder::encodeStringAsFormData(*encodedString, j->data());
|
| + FormDataBuilder::encodeStringAsFormData(*encodedString, item.key());
|
| encodedString->append('=');
|
| - ++j;
|
| if (control == textElement) {
|
| encodedString->append("{searchTerms}", 13);
|
| isElementFound = true;
|
| - } else
|
| - FormDataBuilder::encodeStringAsFormData(*encodedString, j->data());
|
| + } else {
|
| + FormDataBuilder::encodeStringAsFormData(*encodedString, item.data());
|
| + }
|
| }
|
| }
|
| return isElementFound;
|
|
|