Blob: Change the type of WebBlobInfo::LastModified()

from double, seconds from the Unix epoch, to base::Optional<base::Time>.

Bug: 988343
Change-Id: I6f36a98734aea86ed560c841d1b3dd565f4635af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935289Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719359}

third_party/blink/public/platform/web_blob_info.h

@@ -17,19 +17,16 @@ class BlobDataHandle;
 class WebBlobInfo {
  public:
   WebBlobInfo()
-      : is_file_(false),
-        size_(std::numeric_limits<uint64_t>::max()),
-        last_modified_(0) {}
+      : is_file_(false), size_(std::numeric_limits<uint64_t>::max()) {}
   BLINK_EXPORT WebBlobInfo(const WebString& uuid,
                            const WebString& type,
                            uint64_t size,
                            mojo::ScopedMessagePipeHandle);
-  // |last_modified| - Seconds from Unix epoch.
   BLINK_EXPORT WebBlobInfo(const WebString& uuid,
                            const WebString& file_path,
                            const WebString& file_name,
                            const WebString& type,
-                           double last_modified,
+                           const base::Optional<base::Time>& last_modified,
                            uint64_t size,
                            mojo::ScopedMessagePipeHandle);
 
@@ -56,7 +53,7 @@ class WebBlobInfo {
   uint64_t size() const { return size_; }
   const WebString& FilePath() const { return file_path_; }
   const WebString& FileName() const { return file_name_; }
-  double LastModified() const { return last_modified_; }
+  base::Optional<base::Time> LastModified() const { return last_modified_; }
   BLINK_EXPORT mojo::ScopedMessagePipeHandle CloneBlobHandle() const;
 
 #if INSIDE_BLINK
@@ -64,7 +61,7 @@ class WebBlobInfo {
   BLINK_EXPORT WebBlobInfo(scoped_refptr<BlobDataHandle>,
                            const WebString& file_path,
                            const WebString& file_name,
-                           double last_modified);
+                           const base::Optional<base::Time>& last_modified);
   // TODO(mek): Get rid of these constructors after ensuring that the
   // BlobDataHandle always has the correct type and size.
   BLINK_EXPORT WebBlobInfo(scoped_refptr<BlobDataHandle>,
@@ -74,7 +71,7 @@ class WebBlobInfo {
                            const WebString& file_path,
                            const WebString& file_name,
                            const WebString& type,
-                           double last_modified,
+                           const base::Optional<base::Time>& last_modified,
                            uint64_t size);
   BLINK_EXPORT scoped_refptr<BlobDataHandle> GetBlobHandle() const;
 #endif
@@ -87,7 +84,7 @@ class WebBlobInfo {
   WebPrivatePtr<BlobDataHandle> blob_handle_;
   WebString file_path_;   // Only for File
   WebString file_name_;   // Only for File
-  double last_modified_;  // Only for File
+  base::Optional<base::Time> last_modified_;  // Only for File
 };
 
 }  // namespace blink

third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_deserializer.cc

@@ -31,6 +31,7 @@
 #include "third_party/blink/renderer/core/streams/writable_stream.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_shared_array_buffer.h"
+#include "third_party/blink/renderer/platform/file_metadata.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/date_math.h"
 #include "third_party/skia/include/core/SkFilterQuality.h"
@@ -633,8 +634,6 @@ File* V8ScriptValueDeserializer::ReadFileIndex() {
   if (!ReadUint32(&index) || index >= blob_info_array_->size())
     return nullptr;
   const WebBlobInfo& info = (*blob_info_array_)[index];
-  // FIXME: transition WebBlobInfo.lastModified to be milliseconds-based also.
-  double last_modified_ms = info.LastModified() * kMsPerSecond;
   auto blob_handle = info.GetBlobHandle();
   if (!blob_handle) {
     blob_handle =
@@ -642,9 +641,9 @@ File* V8ScriptValueDeserializer::ReadFileIndex() {
   }
   if (!blob_handle)
     return nullptr;
-  return File::CreateFromIndexedSerialization(info.FilePath(), info.FileName(),
-                                              info.size(), last_modified_ms,
-                                              blob_handle);
+  return File::CreateFromIndexedSerialization(
+      info.FilePath(), info.FileName(), info.size(),
+      ToJsTimeOrNaN(info.LastModified()), blob_handle);
 }
 
 DOMRectReadOnly* V8ScriptValueDeserializer::ReadDOMRectReadOnly() {

third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_serializer.cc

@@ -627,14 +627,9 @@ bool V8ScriptValueSerializer::WriteFile(File* file,
     uint64_t size;
     base::Optional<base::Time> last_modified_time;
     file->CaptureSnapshot(size, last_modified_time);
-    // TODO(crbug.com/988343): transition WebBlobInfo.lastModified to be
-    // base::Time also.
-    double last_modified = last_modified_time
-                               ? last_modified_time->ToDoubleT()
-                               : std::numeric_limits<double>::quiet_NaN();
     blob_info_array_->emplace_back(file->GetBlobDataHandle(), file->GetPath(),
-                                   file->name(), file->type(), last_modified,
-                                   size);
+                                   file->name(), file->type(),
+                                   last_modified_time, size);
     WriteUint32(static_cast<uint32_t>(index));
   } else {
     WriteUTF8String(file->HasBackingFile() ? file->GetPath() : g_empty_string);

third_party/blink/renderer/modules/indexeddb/indexed_db_blink_mojom_traits.cc

@@ -10,6 +10,7 @@
 #include "third_party/blink/public/platform/file_path_conversion.h"
 #include "third_party/blink/public/platform/web_blob_info.h"
 #include "third_party/blink/renderer/modules/indexeddb/idb_key_range.h"
+#include "third_party/blink/renderer/platform/file_metadata.h"
 #include "third_party/blink/renderer/platform/mojo/string16_mojom_traits.h"
 #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
@@ -199,7 +200,7 @@ StructTraits<blink::mojom::IDBValueDataView, std::unique_ptr<blink::IDBValue>>::
         name = g_empty_string;
       blob_info->file->name = name;
       blob_info->file->last_modified =
-          base::Time::FromDoubleT(info.LastModified());
+          info.LastModified().value_or(base::Time());
     }
     blob_info->size = info.size();
     blob_info->uuid = info.Uuid();
@@ -241,11 +242,11 @@ bool StructTraits<blink::mojom::IDBValueDataView,
   value_blob_info.ReserveInitialCapacity(blob_or_file_info.size());
   for (const auto& info : blob_or_file_info) {
     if (info->file) {
-      value_blob_info.emplace_back(info->uuid,
-                                   blink::FilePathToWebString(info->file->path),
-                                   info->file->name, info->mime_type,
-                                   info->file->last_modified.ToDoubleT(),
-                                   info->size, info->blob.PassPipe());
+      value_blob_info.emplace_back(
+          info->uuid, blink::FilePathToWebString(info->file->path),
+          info->file->name, info->mime_type,
+          blink::NullableTimeToOptionalTime(info->file->last_modified),
+          info->size, info->blob.PassPipe());
     } else {
       value_blob_info.emplace_back(info->uuid, info->mime_type, info->size,
                                    info->blob.PassPipe());

third_party/blink/renderer/platform/exported/web_blob_info.cc

@@ -26,7 +26,7 @@ WebBlobInfo::WebBlobInfo(const WebString& uuid,
                          const WebString& file_path,
                          const WebString& file_name,
                          const WebString& type,
-                         double last_modified,
+                         const base::Optional<base::Time>& last_modified,
                          uint64_t size,
                          mojo::ScopedMessagePipeHandle handle)
     : WebBlobInfo(
@@ -52,7 +52,7 @@ WebBlobInfo WebBlobInfo::FileForTesting(const WebString& uuid,
                                         const WebString& file_path,
                                         const WebString& file_name,
                                         const WebString& type) {
-  return WebBlobInfo(uuid, file_path, file_name, type, 0,
+  return WebBlobInfo(uuid, file_path, file_name, type, base::nullopt,
                      std::numeric_limits<uint64_t>::max(),
                      mojo::MessagePipe().handle0);
 }
@@ -79,7 +79,7 @@ WebBlobInfo::WebBlobInfo(scoped_refptr<BlobDataHandle> handle)
 WebBlobInfo::WebBlobInfo(scoped_refptr<BlobDataHandle> handle,
                          const WebString& file_path,
                          const WebString& file_name,
-                         double last_modified)
+                         const base::Optional<base::Time>& last_modified)
     : WebBlobInfo(handle,
                   file_path,
                   file_name,
@@ -94,14 +94,13 @@ WebBlobInfo::WebBlobInfo(scoped_refptr<BlobDataHandle> handle,
       uuid_(handle->Uuid()),
       type_(type),
       size_(size),
-      blob_handle_(std::move(handle)),
-      last_modified_(0) {}
+      blob_handle_(std::move(handle)) {}
 
 WebBlobInfo::WebBlobInfo(scoped_refptr<BlobDataHandle> handle,
                          const WebString& file_path,
                          const WebString& file_name,
                          const WebString& type,
-                         double last_modified,
+                         const base::Optional<base::Time>& last_modified,
                          uint64_t size)
     : is_file_(true),
       uuid_(handle->Uuid()),