Reduce usage of WebString::data (Chromium side)

Reduce usage of WebString::data (Chromium side)

WebString::data forces a widening of the underlying String from 8 bits to 16
bits. We should remove this function because most callers of the API don't
understand these implementation details of WebString. In order to remove the
API, we need to remove all the callers. This CL removes all the callers I could
find in Chromium. This CL depends on https://codereview.chromium.org/15806014/
which removes the callers in Blink (and introduces WebString::at to address one
data() use case).

R=jamesr
TBR=groby@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202766

[jamesr, 2013-05-28 17:17:24]

lgtm

[abarth-chromium, 2013-05-28 17:53:29]

Thanks.

(Dependent patch landed in Blink@151268---waiting for roll.)

[commit-bot: I haz the power, 2013-05-29 01:02:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/15960012/1

[commit-bot: I haz the power, 2013-05-29 01:02:35]

Failed to apply patch for webkit/glue/glue_serialize.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: webkit/glue/glue_serialize.cc
  |diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
  |index
1b5edbdede7e52ac5b3a3abdb7afbe9b8c6ebd99..ff0511ed83fbee5e7940f0b04c5f071c5120de1a
100644
  |--- a/webkit/glue/glue_serialize.cc
  |+++ b/webkit/glue/glue_serialize.cc
  --------------------------
  No file to patch.  Skipping patch.
  3 out of 3 hunks ignored

Patch:       webkit/glue/glue_serialize.cc
Index: webkit/glue/glue_serialize.cc
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index
1b5edbdede7e52ac5b3a3abdb7afbe9b8c6ebd99..ff0511ed83fbee5e7940f0b04c5f071c5120de1a
100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -170,12 +170,16 @@ GURL ReadGURL(const SerializeObject* obj) {
 // If length == -1, then the WebString itself is NULL (WebString()).
 // Otherwise the length is the number of WebUChars (not bytes) in the
WebString.
 void WriteString(const WebString& str, SerializeObject* obj) {
+  base::string16 string = str;
+  const char16* data = string.data();
+  size_t length_in_uchars = string.length();
+  size_t length_in_bytes = length_in_uchars * sizeof(char16);
   switch (kVersion) {
     case 1:
       // Version 1 writes <length in bytes><string data>.
       // It saves WebString() and "" as "".
-      obj->pickle.WriteInt(str.length() * sizeof(WebUChar));
-      obj->pickle.WriteBytes(str.data(), str.length() * sizeof(WebUChar));
+      obj->pickle.WriteInt(length_in_bytes);
+      obj->pickle.WriteBytes(data, length_in_bytes);
       break;
     case 2:
       // Version 2 writes <length in WebUChar><string data>.
@@ -183,9 +187,8 @@ void WriteString(const WebString& str, SerializeObject* obj)
{
       if (str.isNull()) {
         obj->pickle.WriteInt(-1);
       } else {
-        obj->pickle.WriteInt(str.length());
-        obj->pickle.WriteBytes(str.data(),
-                               str.length() * sizeof(WebUChar));
+        obj->pickle.WriteInt(length_in_uchars);
+        obj->pickle.WriteBytes(data, length_in_bytes);
       }
       break;
     default:
@@ -194,9 +197,8 @@ void WriteString(const WebString& str, SerializeObject* obj)
{
       if (str.isNull()) {
         obj->pickle.WriteInt(-1);
       } else {
-        obj->pickle.WriteInt(str.length() * sizeof(WebUChar));
-        obj->pickle.WriteBytes(str.data(),
-                               str.length() * sizeof(WebUChar));
+        obj->pickle.WriteInt(length_in_bytes);
+        obj->pickle.WriteBytes(data, length_in_bytes);
       }
       break;
   }

[commit-bot: I haz the power, 2013-05-29 01:13:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/15960012/6001

[commit-bot: I haz the power, 2013-05-29 01:32:41]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[abarth-chromium, 2013-05-29 01:42:47]

@groby: Apparently I'm missing an OWNER for chrome/renderer/spellchecker.  I'm
going to add you as a TBR, if that's ok.

[commit-bot: I haz the power, 2013-05-29 01:43:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/15960012/6001

[groby-ooo-7-16, 2013-05-29 01:44:33]

Totally, and thanks for cleaning this up.

LGTM

[commit-bot: I haz the power, 2013-05-29 03:55:05]

Change committed as 202766