Allow huge data: URIs only via WebView.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/pickle.h"
 #include "base/time/time.h"
@@ skipping 16 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 = 20151204;
 
 }  // namespace
 
 bool WriteToPickle(const content::WebContents& web_contents,
                    base::Pickle* pickle) {
   DCHECK(pickle);
 
   if (!internal::WriteHeaderToPickle(pickle))
     return false;
 
@@ skipping 124 matching lines @@
 
   if (!pickle->WriteBool(static_cast<int>(entry.GetHasPostData())))
     return false;
 
   if (!pickle->WriteString(entry.GetOriginalRequestURL().spec()))
     return false;
 
   if (!pickle->WriteString(entry.GetBaseURLForDataURL().spec()))
     return false;
 
+  if (!pickle->WriteString(entry.GetDataURLAsString()))
+    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()))
     return false;
 
   // Please update AW_STATE_VERSION if serialization format is changed.
@@ skipping 62 matching lines @@
   }
 
   {
     string base_url_for_data_url;
     if (!iterator->ReadString(&base_url_for_data_url))
       return false;
     entry->SetBaseURLForDataURL(GURL(base_url_for_data_url));
   }
 
   {
+    string data_url;
+    if (!iterator->ReadString(&data_url))
+      return false;
+    entry->SetDataURLAsString(data_url);
+  }
+
+  {
     bool is_overriding_user_agent;
     if (!iterator->ReadBool(&is_overriding_user_agent))
       return false;
     entry->SetIsOverridingUserAgent(is_overriding_user_agent);
   }
 
   {
     int64 timestamp;
     if (!iterator->ReadInt64(&timestamp))
       return false;
     entry->SetTimestamp(base::Time::FromInternalValue(timestamp));
   }
 
   {
     int http_status_code;
     if (!iterator->ReadInt(&http_status_code))
       return false;
     entry->SetHttpStatusCode(http_status_code);
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview