Support FileSystem URL in File object

webkit/glue/glue_serialize.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 "webkit/glue/glue_serialize.h"
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 50 matching lines @@
 //    This version checks and reads v1 and v2 correctly.
 // 4: Adds support for storing FormData::identifier().
 // 5: Adds support for empty FormData
 // 6: Adds support for documentSequenceNumbers
 // 7: Adds support for stateObject
 // 8: Adds support for file range and modification time
 // 9: Adds support for itemSequenceNumbers
 // 10: Adds support for blob
 // 11: Adds support for pageScaleFactor
 // 12: Adds support for hasPasswordData in HTTP body
+// 13: Adds support for URL (FileSystem URL)
 // Should be const, but unit tests may modify it.
 //
 // NOTE: If the version is -1, then the pickle contains only a URL string.
 // See CreateHistoryStateForURL.
 //
-int kVersion = 12;
+int kVersion = 13;
 
 // A bunch of convenience functions to read/write to SerializeObjects.
 // The serializers assume the input data is in the correct format and so does
 // no error checking.
 inline void WriteData(const void* data, int length, SerializeObject* obj) {
   obj->pickle.WriteData(static_cast<const char*>(data), length);
 }
 
 inline void ReadData(const SerializeObject* obj, const void** data,
                      int* length) {
@@ skipping 164 matching lines @@
   for (size_t i = 0; http_body.elementAt(i, element); ++i) {
     WriteInteger(element.type, obj);
     if (element.type == WebHTTPBody::Element::TypeData) {
       WriteData(element.data.data(), static_cast<int>(element.data.size()),
                 obj);
     } else if (element.type == WebHTTPBody::Element::TypeFile) {
       WriteString(element.filePath, obj);
       WriteInteger64(element.fileStart, obj);
       WriteInteger64(element.fileLength, obj);
       WriteReal(element.modificationTime, obj);
+    } else if (element.type == WebHTTPBody::Element::TypeURL) {
+      WriteGURL(element.url, obj);
+      WriteInteger64(element.fileStart, obj);
+      WriteInteger64(element.fileLength, obj);
+      WriteReal(element.modificationTime, obj);
     } else {
-      WriteGURL(element.blobURL, obj);
+      WriteGURL(element.url, obj);
     }
   }
   WriteInteger64(http_body.identifier(), obj);
   WriteBoolean(http_body.containsPasswordData(), obj);
 }
 
 WebHTTPBody ReadFormData(const SerializeObject* obj) {
   // In newer versions, an initial boolean indicates if we have form data.
   if (obj->version >= 5 && !ReadBoolean(obj))
     return WebHTTPBody();
@@ skipping 19 matching lines @@
       long long file_start = 0;
       long long file_length = -1;
       double modification_time = 0.0;
       if (obj->version >= 8) {
         file_start = ReadInteger64(obj);
         file_length = ReadInteger64(obj);
         modification_time = ReadReal(obj);
       }
       http_body.appendFileRange(file_path, file_start, file_length,
                                 modification_time);
+    } else if (type == WebHTTPBody::Element::TypeURL) {
+      GURL url = ReadGURL(obj);
+      long long file_start = 0;
+      long long file_length = -1;
+      double modification_time = 0.0;
+      file_start = ReadInteger64(obj);
+      file_length = ReadInteger64(obj);
+      modification_time = ReadReal(obj);
+      http_body.appendURLRange(url, file_start, file_length,
+                               modification_time);
     } else if (obj->version >= 10) {
       GURL blob_url = ReadGURL(obj);
       http_body.appendBlob(blob_url);
     }
   }
   if (obj->version >= 4)
     http_body.setIdentifier(ReadInteger64(obj));
 
   if (obj->version >= 12)
     http_body.setContainsPasswordData(ReadBoolean(obj));
@@ skipping 265 matching lines @@
   *serialized_item = obj.GetAsString();
 
   kVersion = real_version;
 }
 
 int HistoryItemCurrentVersion() {
   return kVersion;
 }
 
 }  // namespace webkit_glue