Changeset 119680 in webkit

Timestamp:

Jun 6, 2012 9:34:40 PM (12 years ago)

Author:

kinuko@chromium.org

Message:

File::lastModifiedDate should use NaN or separate boolean flag for null Date value
​https://bugs.webkit.org/show_bug.cgi?id=87826

Reviewed by Kent Tamura.

Test: http/tests/local/fileapi/file-last-modified-after-delete.html

• fileapi/File.cpp:

(WebCore::File::File):
(WebCore::File::captureSnapshot):
(WebCore::File::lastModifiedDate):
(WebCore::File::lastModifiedDateForBinding): Removed.

• fileapi/File.h:

(File):

• fileapi/File.idl:
• platform/FileMetadata.h:

(WebCore::FileMetadata::FileMetadata):

• platform/FileSystem.h:
• platform/chromium/support/WebHTTPBody.cpp:

(WebKit::WebHTTPBody::elementAt):

• platform/network/BlobData.cpp:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• fileapi/File.cpp (modified) (6 diffs)
• fileapi/File.h (modified) (1 diff)
• fileapi/File.idl (modified) (1 diff)
• platform/FileMetadata.h (modified) (2 diffs)
• platform/FileSystem.h (modified) (1 diff)
• platform/chromium/support/WebHTTPBody.cpp (modified) (2 diffs)
• platform/network/BlobData.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-06  Kinuko Yasuda  <kinuko@chromium.org>
+
+        File::lastModifiedDate should use NaN or separate boolean flag for null Date value
+        https://bugs.webkit.org/show_bug.cgi?id=87826
+
+        Reviewed by Kent Tamura.
+
+        Test: http/tests/local/fileapi/file-last-modified-after-delete.html
+
+        * fileapi/File.cpp:
+        (WebCore::File::File):
+        (WebCore::File::captureSnapshot):
+        (WebCore::File::lastModifiedDate):
+        (WebCore::File::lastModifiedDateForBinding): Removed.
+        * fileapi/File.h:
+        (File):
+        * fileapi/File.idl:
+        * platform/FileMetadata.h:
+        (WebCore::FileMetadata::FileMetadata):
+        * platform/FileSystem.h:
+        * platform/chromium/support/WebHTTPBody.cpp:
+        (WebKit::WebHTTPBody::elementAt):
+        * platform/network/BlobData.cpp:
+        (WebCore):
+
 2012-06-06  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/fileapi/File.cpp

@@ -31 +31 @@
 #include "MIMETypeRegistry.h"
 #include <wtf/CurrentTime.h>
+#include <wtf/MathExtras.h>
 #include <wtf/text/WTFString.h>
 
@@ -87 +88 @@
 #if ENABLE(FILE_SYSTEM)
     , m_snapshotSize(-1)
-    , m_snapshotModificationTime(0)
+    , m_snapshotModificationTime(invalidTime)
 #endif
 {
@@ -97 +98 @@
 #if ENABLE(FILE_SYSTEM)
     , m_snapshotSize(-1)
-    , m_snapshotModificationTime(0)
+    , m_snapshotModificationTime(invalidTime)
 #endif
 {
@@ -112 +113 @@
 #if ENABLE(FILE_SYSTEM)
     , m_snapshotSize(-1)
-    , m_snapshotModificationTime(0)
+    , m_snapshotModificationTime(invalidTime)
 #endif
 {
@@ -137 +138 @@
     time_t modificationTime;
     if (!getFileModificationTime(m_path, modificationTime))
-        return 0;
+        return invalidTime;
 
     // Needs to return epoch time in milliseconds for Date.
     return modificationTime * 1000.0;
-}
-
-double File::lastModifiedDateForBinding() const
-{
-    double value = lastModifiedDate();
-    return (!value) ? std::numeric_limits<double>::quiet_NaN() : value;
 }
 
@@ -179 +174 @@
     if (!getFileMetadata(m_path, metadata)) {
         snapshotSize = 0;
-        snapshotModificationTime = 0;
+        snapshotModificationTime = invalidTime;
         return;
     }

trunk/Source/WebCore/fileapi/File.h

@@ -78 +78 @@
     const String& name() const { return m_name; }
 
-    // This may return zero if getFileModificationTime() platform call has failed or zero snapshot lastModifiedTime is given at construction time.
+    // This may return NaN (which is converted to null Date in javascript layer) if getFileModificationTime() platform call has failed or the information is not available.
     double lastModifiedDate() const;
-
-    // For binding. We want to return null Date if we get the value 0 Date (which is used to indicate the information is unavailable).
-    double lastModifiedDateForBinding() const;
 
 #if ENABLE(DIRECTORY_UPLOAD)

trunk/Source/WebCore/fileapi/File.idl

@@ -33 +33 @@
         readonly attribute DOMString name;
 #if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
-        readonly attribute [ImplementedAs=lastModifiedDateForBinding] Date lastModifiedDate;
+        readonly attribute Date lastModifiedDate;
 #endif
 #if defined(ENABLE_DIRECTORY_UPLOAD) && ENABLE_DIRECTORY_UPLOAD

trunk/Source/WebCore/platform/FileMetadata.h

@@ -32 +32 @@
 #define FileMetadata_h
 
+#include "FileSystem.h"
 #include <wtf/text/WTFString.h>
 
@@ -57 +58 @@
 #endif
 
-    FileMetadata() : modificationTime(0.0), length(-1), type(TypeUnknown) { }
+    FileMetadata() : modificationTime(invalidTime), length(-1), type(TypeUnknown) { }
 };
 

trunk/Source/WebCore/platform/FileSystem.h

@@ -146 +146 @@
 };
 
+const double invalidTime = std::numeric_limits<double>::quiet_NaN();
+
 #if OS(WINDOWS)
 static const char PlatformFilePathSeparator = '\\';

trunk/Source/WebCore/platform/chromium/support/WebHTTPBody.cpp

@@ -32 +32 @@
 #include <public/WebHTTPBody.h>
 
+#include "FileSystem.h"
 #include "FormData.h"
 
@@ -78 +79 @@
     result.fileStart = 0;
     result.fileLength = 0;
-    result.modificationTime = 0.0;
+    result.modificationTime = invalidTime;
     result.blobURL = KURL();
 

trunk/Source/WebCore/platform/network/BlobData.cpp

@@ -31 +31 @@
 #include "config.h"
 #include "BlobData.h"
+#include "FileSystem.h"
 
 #include <wtf/OwnPtr.h>
@@ -41 +42 @@
 
 const long long BlobDataItem::toEndOfFile = -1;
-const double BlobDataItem::doNotCheckFileChange = 0;
+const double BlobDataItem::doNotCheckFileChange = invalidTime;
 
 RawData::RawData()