BlobBuilder/FormData refactor attempt

WebKit/chromium/src/WebSearchableFormData.cpp

 /*
  * Copyright (C) 2009 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 169 matching lines @@
             default:
                 // All other input types are indexable.
                 break;
             }
       }
 
       FormDataList dataList(encoding);
       if (!formElement->appendFormData(dataList, false))
           continue;
 
-      const Vector<FormDataList::Item>& itemList = dataList.list();
-      if (isTextElement && !itemList.isEmpty()) {
+      const BlobItemList& items = dataList.items();
+      if (isTextElement && !items.isEmpty()) {
           if (textElement) {
               // The auto-complete bar only knows how to fill in one value.
               // This form has multiple fields; don't treat it as searchable.
               return false;
           }
           textElement = static_cast<HTMLInputElement*>(formElement);
       }
-      for (Vector<FormDataList::Item>::const_iterator j(itemList.begin()); j != itemList.end(); ++j) {
+      for (BlobItemList::const_iterator j(items.begin()); j != items.end(); ++j) {
+          const StringBlobItem* item = (*j)->toStringBlobItem();
+          if (!item)
+              continue;
           // Handle ISINDEX / <input name=isindex> specially, but only if it's
           // the first entry.
-          if (!encodedString->isEmpty() || j->data() != "isindex") {
+          if (!encodedString->isEmpty() || item->cstr() != "isindex") {
               if (!encodedString->isEmpty())
                   encodedString->append('&');
-              FormDataBuilder::encodeStringAsFormData(*encodedString, j->data());
+              FormDataBuilder::encodeStringAsFormData(*encodedString, item->cstr());
               encodedString->append('=');
           }
           ++j;
           if (formElement == textElement)
               encodedString->append("{searchTerms}", 13);
           else
-              FormDataBuilder::encodeStringAsFormData(*encodedString, j->data());
+              FormDataBuilder::encodeStringAsFormData(*encodedString, item->cstr());
       }
     }
 
     return textElement;
 }
 
 } // namespace
 
 namespace WebKit {
 
@@ skipping 27 matching lines @@
 
     String action(formElement->action());
     KURL url(frame->loader()->completeURL(action.isNull() ? "" : action));
     RefPtr<FormData> formData = FormData::create(encodedString);
     url.setQuery(formData->flattenToString());
     m_url = url;
     m_encoding = encoding;
 }
 
 } // namespace WebKit