- added missing %{!?with_nacl:-Ddisable_nacl=1}

[packages/chromium-browser.git] / search-workaround.patch

--- chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc.orig	2011-05-12 04:00:22.000000000 +0200
+++ chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc	2011-05-12 18:20:21.260874114 +0200
@@ -347,28 +347,28 @@
        i != replacements_.rend(); ++i) {
     switch (i->type) {
       case ENCODING:
-        url.insert(i->index, input_encoding);
+        /* Temporary workaround according to http://crbug.com/41887 */
+        url.replace(i->index, 0, input_encoding);
         break;
 
       case GOOGLE_ACCEPTED_SUGGESTION:
         if (accepted_suggestion == NO_SUGGESTION_CHOSEN)
-          url.insert(i->index, "aq=f&");
+          url.replace(i->index, 0, "aq=f&");
         else if (accepted_suggestion != NO_SUGGESTIONS_AVAILABLE)
-          url.insert(i->index,
-                     base::StringPrintf("aq=%d&", accepted_suggestion));
+          url.replace(i->index, 0, base::StringPrintf("aq=%d&", accepted_suggestion));
         break;
 
       case GOOGLE_BASE_URL:
-        url.insert(i->index, search_terms_data.GoogleBaseURLValue());
+        url.replace(i->index, 0, search_terms_data.GoogleBaseURLValue());
         break;
 
       case GOOGLE_BASE_SUGGEST_URL:
-        url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue());
+        url.replace(i->index, 0, search_terms_data.GoogleBaseSuggestURLValue());
         break;
 
       case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
         if (accepted_suggestion >= 0)
-          url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) +
+          url.replace(i->index, 0, "oq=" +UTF16ToUTF8(encoded_original_query) +
                                "&");
         break;
 
@@ -392,17 +392,17 @@
         base::UTF16ToCodepage(terms, input_encoding.c_str(),
                               base::OnStringConversionError::SKIP,
                               &unescaped_terms);
-        url.insert(i->index, std::string(unescaped_terms.begin(),
+        url.replace(i->index, 0, std::string(unescaped_terms.begin(),
                                          unescaped_terms.end()));
         break;
       }
 
       case LANGUAGE:
-        url.insert(i->index, search_terms_data.GetApplicationLocale());
+        url.replace(i->index, 0, search_terms_data.GetApplicationLocale());
         break;
 
       case SEARCH_TERMS:
-        url.insert(i->index, UTF16ToUTF8(encoded_terms));
+        url.replace(i->index, 0, UTF16ToUTF8(encoded_terms));
         break;
 
       default: