Revert of Upgrade Blink to milliseconds-based last modified filetimes, part 3.

Source/core/fileapi/File.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 56 matching lines @@
 
 static PassOwnPtr<BlobData> createBlobDataForFileWithName(const String& path, const String& fileSystemName, File::ContentTypeLookupPolicy policy)
 {
     return createBlobDataForFileWithType(path, getContentTypeFromFileName(fileSystemName, policy));
 }
 
 static PassOwnPtr<BlobData> createBlobDataForFileWithMetadata(const String& fileSystemName, const FileMetadata& metadata)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(getContentTypeFromFileName(fileSystemName, File::WellKnownContentTypes));
-    blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTimeMS / msPerSecond);
+    blobData->appendFile(metadata.platformPath, 0, metadata.length, metadata.modificationTime);
     return blobData.release();
 }
 
 static PassOwnPtr<BlobData> createBlobDataForFileSystemURL(const KURL& fileSystemURL, const FileMetadata& metadata)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(getContentTypeFromFileName(fileSystemURL.path(), File::WellKnownContentTypes));
-    blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length, metadata.modificationTimeMS / msPerSecond);
+    blobData->appendFileSystemURL(fileSystemURL, 0, metadata.length, metadata.modificationTime);
     return blobData.release();
 }
 
 File* File::createWithRelativePath(const String& path, const String& relativePath)
 {
     File* file = new File(path, File::AllContentTypes, File::IsUserVisible);
     file->m_relativePath = relativePath;
     return file;
 }
 
 File::File(const String& path, ContentTypeLookupPolicy policy, UserVisibility userVisibility)
     : Blob(BlobDataHandle::create(createBlobDataForFile(path, policy), -1))
     , m_hasBackingFile(true)
     , m_userVisibility(userVisibility)
     , m_path(path)
     , m_name(Platform::current()->fileUtilities()->baseName(path))
     , m_snapshotSize(-1)
-    , m_snapshotModificationTimeMS(invalidFileTime())
+    , m_snapshotModificationTime(invalidFileTime())
 {
 }
 
 File::File(const String& path, const String& name, ContentTypeLookupPolicy policy, UserVisibility userVisibility)
     : Blob(BlobDataHandle::create(createBlobDataForFileWithName(path, name, policy), -1))
     , m_hasBackingFile(true)
     , m_userVisibility(userVisibility)
     , m_path(path)
     , m_name(name)
     , m_snapshotSize(-1)
-    , m_snapshotModificationTimeMS(invalidFileTime())
+    , m_snapshotModificationTime(invalidFileTime())
 {
 }
 
 File::File(const String& path, const String& name, const String& relativePath, UserVisibility userVisibility, bool hasSnaphotData, uint64_t size, double lastModified, PassRefPtr<BlobDataHandle> blobDataHandle)
     : Blob(blobDataHandle)
     , m_hasBackingFile(!path.isEmpty() || !relativePath.isEmpty())
     , m_userVisibility(userVisibility)
     , m_path(path)
     , m_name(name)
     , m_snapshotSize(hasSnaphotData ? static_cast<long long>(size) : -1)
-    , m_snapshotModificationTimeMS(hasSnaphotData ? lastModified : invalidFileTime())
+    , m_snapshotModificationTime(hasSnaphotData ? lastModified : invalidFileTime())
     , m_relativePath(relativePath)
 {
 }
 
-File::File(const String& name, double modificationTimeMS, PassRefPtr<BlobDataHandle> blobDataHandle)
+File::File(const String& name, double modificationTime, PassRefPtr<BlobDataHandle> blobDataHandle)
     : Blob(blobDataHandle)
     , m_hasBackingFile(false)
     , m_userVisibility(File::IsNotUserVisible)
     , m_name(name)
     , m_snapshotSize(Blob::size())
-    , m_snapshotModificationTimeMS(modificationTimeMS)
+    , m_snapshotModificationTime(modificationTime)
 {
 }
 
 File::File(const String& name, const FileMetadata& metadata, UserVisibility userVisibility)
     : Blob(BlobDataHandle::create(createBlobDataForFileWithMetadata(name, metadata), metadata.length))
     , m_hasBackingFile(true)
     , m_userVisibility(userVisibility)
     , m_path(metadata.platformPath)
     , m_name(name)
     , m_snapshotSize(metadata.length)
-    , m_snapshotModificationTimeMS(metadata.modificationTimeMS)
+    , m_snapshotModificationTime(metadata.modificationTime)
 {
 }
 
 File::File(const KURL& fileSystemURL, const FileMetadata& metadata, UserVisibility userVisibility)
     : Blob(BlobDataHandle::create(createBlobDataForFileSystemURL(fileSystemURL, metadata), metadata.length))
     , m_hasBackingFile(false)
     , m_userVisibility(userVisibility)
     , m_name(decodeURLEscapeSequences(fileSystemURL.lastPathComponent()))
     , m_fileSystemURL(fileSystemURL)
     , m_snapshotSize(metadata.length)
-    , m_snapshotModificationTimeMS(metadata.modificationTimeMS)
+    , m_snapshotModificationTime(metadata.modificationTime)
 {
 }
 
 File::File(const File& other)
     : Blob(other.blobDataHandle())
     , m_hasBackingFile(other.m_hasBackingFile)
     , m_userVisibility(other.m_userVisibility)
     , m_path(other.m_path)
     , m_name(other.m_name)
     , m_fileSystemURL(other.m_fileSystemURL)
     , m_snapshotSize(other.m_snapshotSize)
-    , m_snapshotModificationTimeMS(other.m_snapshotModificationTimeMS)
+    , m_snapshotModificationTime(other.m_snapshotModificationTime)
     , m_relativePath(other.m_relativePath)
 {
 }
 
 File* File::clone(const String& name) const
 {
     File* file = new File(*this);
     if (!name.isNull())
         file->m_name = name;
     return file;
 }
 
 double File::lastModifiedMS() const
 {
-    if (hasValidSnapshotMetadata() && isValidFileTime(m_snapshotModificationTimeMS))
-        return m_snapshotModificationTimeMS;
+    if (hasValidSnapshotMetadata() && isValidFileTime(m_snapshotModificationTime))
+        return m_snapshotModificationTime * msPerSecond;
 
-    time_t modificationTimeMS;
-    if (hasBackingFile() && getFileModificationTime(m_path, modificationTimeMS) && isValidFileTime(modificationTimeMS))
-        return modificationTimeMS;
+    time_t modificationTime;
+    if (hasBackingFile() && getFileModificationTime(m_path, modificationTime) && isValidFileTime(modificationTime))
+        return modificationTime * msPerSecond;
 
-    return currentTimeMS();
+    return currentTime() * msPerSecond;
 }
 
 long long File::lastModified() const
 {
     double modifiedDate = lastModifiedMS();
 
     // The getter should return the current time when the last modification time isn't known.
     if (!isValidFileTime(modifiedDate))
         modifiedDate = currentTimeMS();
 
@@ skipping 33 matching lines @@
     if (hasBeenClosed()) {
         exceptionState.throwDOMException(InvalidStateError, "File has been closed.");
         return nullptr;
     }
 
     if (!m_hasBackingFile)
         return Blob::slice(start, end, contentType, exceptionState);
 
     // FIXME: This involves synchronous file operation. We need to figure out how to make it asynchronous.
     long long size;
-    double modificationTimeMS;
-    captureSnapshot(size, modificationTimeMS);
+    double modificationTime;
+    captureSnapshot(size, modificationTime);
     clampSliceOffsets(size, start, end);
 
     long long length = end - start;
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->setContentType(contentType);
     if (!m_fileSystemURL.isEmpty()) {
-        blobData->appendFileSystemURL(m_fileSystemURL, start, length, modificationTimeMS / msPerSecond);
+        blobData->appendFileSystemURL(m_fileSystemURL, start, length, modificationTime);
     } else {
         ASSERT(!m_path.isEmpty());
-        blobData->appendFile(m_path, start, length, modificationTimeMS / msPerSecond);
+        blobData->appendFile(m_path, start, length, modificationTime);
     }
     return Blob::create(BlobDataHandle::create(blobData.release(), length));
 }
 
-void File::captureSnapshot(long long& snapshotSize, double& snapshotModificationTimeMS) const
+void File::captureSnapshot(long long& snapshotSize, double& snapshotModificationTime) const
 {
     if (hasValidSnapshotMetadata()) {
         snapshotSize = m_snapshotSize;
-        snapshotModificationTimeMS = m_snapshotModificationTimeMS;
+        snapshotModificationTime = m_snapshotModificationTime;
         return;
     }
 
     // Obtains a snapshot of the file by capturing its current size and modification time. This is used when we slice a file for the first time.
     // If we fail to retrieve the size or modification time, probably due to that the file has been deleted, 0 size is returned.
     FileMetadata metadata;
     if (!hasBackingFile() || !getFileMetadata(m_path, metadata)) {
         snapshotSize = 0;
-        snapshotModificationTimeMS = invalidFileTime();
+        snapshotModificationTime = invalidFileTime();
         return;
     }
 
     snapshotSize = metadata.length;
-    snapshotModificationTimeMS = metadata.modificationTimeMS;
+    snapshotModificationTime = metadata.modificationTime;
 }
 
 void File::close(ExecutionContext* executionContext, ExceptionState& exceptionState)
 {
     if (hasBeenClosed()) {
         exceptionState.throwDOMException(InvalidStateError, "Blob has been closed.");
         return;
     }
 
     // Reset the File to its closed representation, an empty
     // Blob. The name isn't cleared, as it should still be
     // available.
     m_hasBackingFile = false;
     m_path = String();
     m_fileSystemURL = KURL();
     invalidateSnapshotMetadata();
     m_relativePath = String();
     Blob::close(executionContext, exceptionState);
 }
 
 void File::appendTo(BlobData& blobData) const
 {
     if (!m_hasBackingFile) {
         Blob::appendTo(blobData);
         return;
     }
 
     // FIXME: This involves synchronous file operation. We need to figure out how to make it asynchronous.
     long long size;
-    double modificationTimeMS;
-    captureSnapshot(size, modificationTimeMS);
+    double modificationTime;
+    captureSnapshot(size, modificationTime);
     if (!m_fileSystemURL.isEmpty()) {
-        blobData.appendFileSystemURL(m_fileSystemURL, 0, size, modificationTimeMS / msPerSecond);
+        blobData.appendFileSystemURL(m_fileSystemURL, 0, size, modificationTime);
         return;
     }
     ASSERT(!m_path.isEmpty());
-    blobData.appendFile(m_path, 0, size, modificationTimeMS / msPerSecond);
+    blobData.appendFile(m_path, 0, size, modificationTime);
 }
 
 bool File::hasSameSource(const File& other) const
 {
     if (m_hasBackingFile != other.m_hasBackingFile)
         return false;
 
     if (m_hasBackingFile)
         return m_path == other.m_path;
 
     if (m_fileSystemURL.isEmpty() != other.m_fileSystemURL.isEmpty())
         return false;
 
     if (!m_fileSystemURL.isEmpty())
         return m_fileSystemURL == other.m_fileSystemURL;
 
     return uuid() == other.uuid();
 }
 
 } // namespace blink