Allow data URL > 2MB for loadDataWithBaseURL

android_webview/native/state_serializer.cc

Index: android_webview/native/state_serializer.cc
diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc
index f4a628b39a70bf1023f80b24e00c3361f50016fe..3ed6c87105701a79421eb86f6c0a3ed1a49f2ed2 100644
--- a/android_webview/native/state_serializer.cc
+++ b/android_webview/native/state_serializer.cc
@@ -35,7 +35,7 @@ namespace {
 // Sanity check value that we are restoring from a valid pickle.
 // This can potentially used as an actual serialization version number in the
 // future if we ever decide to support restoring from older versions.
-const uint32 AW_STATE_VERSION = 20130814;
+const uint32 AW_STATE_VERSION = 20131123;
 
 }  // namespace
 
@@ -177,6 +177,11 @@ bool WriteNavigationEntryToPickle(const content::NavigationEntry& entry,
   if (!pickle->WriteString(entry.GetOriginalRequestURL().spec()))
     return false;
 
+  base::StringPiece data(base::RefCountedMemory::AsString(
+        entry.GetDataForDataURL()));
+  if (!pickle->WriteData(data.data(), data.size()))
+    return false;
+
   if (!pickle->WriteString(entry.GetBaseURLForDataURL().spec()))
     return false;
 
@@ -255,6 +260,14 @@ bool RestoreNavigationEntryFromPickle(PickleIterator* iterator,
   }
 
   {
+    scoped_refptr<base::RefCountedString> res = new base::RefCountedString;
+    if (!iterator->ReadString(&res->data()))

[boliu, 2013/11/26 17:15:15]

Not pickle expert, but does can ReadString be matched with WriteData?

[joth, 2013/11/27 01:31:22]

The internal implementation makes them compatible, but I agree it's a bad smell
to depend on this. Will use ReadData like I do in the IPC traits.

Done

+      return false;
+    if (res->size())
+      entry->SetDataForDataURL(res.get());
+  }
+
+  {
     string base_url_for_data_url;
     if (!iterator->ReadString(&base_url_for_data_url))
       return false;