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;
 
+  {
+    const char* data = NULL;
+    size_t size = 0;
+    scoped_refptr<base::RefCountedMemory> p = entry.GetDataForDataURL();
+    if (p.get()) {
+      data = reinterpret_cast<const char*>(p->front());
+      size = p->size();
+    }
+    if (!pickle->WriteData(data, size))

[Nico, 2013/11/27 05:50:59]

Do you need to do this call when size is 0? If not, can this be in the if? If
so, is it worth to have local variables for size (maybe not) and data (maybe
yes, not sure)?

[joth, 2013/11/27 06:23:16]

Yes, We need to write something even when the object is NULL or holds zero
bytes, so that when internalizing again we know whether or not to try and read
the data payload back in again. I'm basically using the WriteData(NULL, 0) as
the sentinel so we know we don't need to initialize that member (line 274)

+      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));
   }
 
   {
+    const char* data;
+    int len;
+    if (!iterator->ReadData(&data, &len))
+      return false;
+    if (len > 0) {
+      scoped_refptr<base::RefCountedString> ref = new base::RefCountedString;
+      ref->data().assign(data, len);
+      entry->SetDataForDataURL(ref.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