Allow data URL > 2MB for loadDataWithBaseURL

android_webview/native/state_serializer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/state_serializer.h"
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/pickle.h"
@@ skipping 17 matching lines @@
 
 using std::string;
 
 namespace android_webview {
 
 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
 
 bool WriteToPickle(const content::WebContents& web_contents,
                    Pickle* pickle) {
   DCHECK(pickle);
 
   if (!internal::WriteHeaderToPickle(pickle))
     return false;
 
@@ skipping 121 matching lines @@
 
   if (!pickle->WriteString(entry.GetPageState().ToEncodedData()))
     return false;
 
   if (!pickle->WriteBool(static_cast<int>(entry.GetHasPostData())))
     return false;
 
   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;
 
   if (!pickle->WriteBool(static_cast<int>(entry.GetIsOverridingUserAgent())))
     return false;
 
   if (!pickle->WriteInt64(entry.GetTimestamp().ToInternalValue()))
     return false;
 
   if (!pickle->WriteInt(entry.GetHttpStatusCode()))
@@ skipping 58 matching lines @@
   }
 
   {
     string original_request_url;
     if (!iterator->ReadString(&original_request_url))
       return false;
     entry->SetOriginalRequestURL(GURL(original_request_url));
   }
 
   {
+    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;
     entry->SetBaseURLForDataURL(GURL(base_url_for_data_url));
   }
 
   {
     bool is_overriding_user_agent;
     if (!iterator->ReadBool(&is_overriding_user_agent))
       return false;
@@ skipping 13 matching lines @@
       return false;
     entry->SetHttpStatusCode(http_status_code);
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview