Change all callers of WebFileInfo::appendFileRange() to use the new...

webkit/glue/glue_serialize.cc

 // Copyright (c) 2010 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"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebData;
-using WebKit::WebFileInfo;
 using WebKit::WebHistoryItem;
 using WebKit::WebHTTPBody;
 using WebKit::WebPoint;
 using WebKit::WebSerializedScriptValue;
 using WebKit::WebString;
 using WebKit::WebUChar;
 using WebKit::WebVector;
 
 namespace webkit_glue {
 
@@ skipping 199 matching lines @@
   WebHTTPBody::Element element;
   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.fileInfo.modificationTime, obj);
+      WriteReal(element.modificationTime, obj);
     } else {
       WriteGURL(element.blobURL, obj);
     }
   }
   WriteInteger64(http_body.identifier(), obj);
 }
 
 static WebHTTPBody ReadFormData(const SerializeObject* obj) {
   // In newer versions, an initial boolean indicates if we have form data.
   if (obj->version >= 5 && !ReadBoolean(obj))
@@ skipping 12 matching lines @@
     if (type == WebHTTPBody::Element::TypeData) {
       const void* data;
       int length = -1;
       ReadData(obj, &data, &length);
       if (length >= 0)
         http_body.appendData(WebData(static_cast<const char*>(data), length));
     } else if (type == WebHTTPBody::Element::TypeFile) {
       WebString file_path = ReadString(obj);
       long long file_start = 0;
       long long file_length = -1;
-      WebFileInfo file_info;
+      double modification_time = 0.0;
       if (obj->version >= 8) {
         file_start = ReadInteger64(obj);
         file_length = ReadInteger64(obj);
-        file_info.modificationTime = ReadReal(obj);
+        modification_time = ReadReal(obj);
       }
-      http_body.appendFileRange(file_path, file_start, file_length, file_info);
+      http_body.appendFileRange(file_path, 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));
 
   return http_body;
 }
@@ skipping 180 matching lines @@
   const WebHistoryItem& item = HistoryItemFromString(content_state, false);
   if (item.isNull()) {
     // Couldn't parse the string, return an empty string.
     return std::string();
   }
 
   return HistoryItemToString(item);
 }
 
 }  // namespace webkit_glue