From 65e08559dd9b0bc349868a0b954d58f3dc9cae48 Mon Sep 17 00:00:00 2001 From: sigbjornf Date: Tue, 10 Feb 2015 04:44:36 -0800 Subject: [PATCH] Upgrade Blink to milliseconds-based last modified filetimes, part 6. Have content::FileInfoToWebFileInfo() no longer fill in WebFileInfo::modificationTimeMS; it is now unused by Blink. Once landed, this lets Blink remove the WebFileInfo field entirely. This is part 6 in the following patch series, 1: [blink] add WebFileInfo::modificationTimeMS [ https://codereview.chromium.org/873723004/ ] 2: [chromium] fill in modificationTimeMS [ https://codereview.chromium.org/884413002/ ] 3: [blink] make use of modificationTimeMS [ https://codereview.chromium.org/884393002/ ] 4: [chromium] set modificationTime to something msec-based [ https://codereview.chromium.org/862203003/ ] 5: [blink] switch to modificationTime [ https://codereview.chromium.org/882343002/ ] 6: [chromium] *this one* [ https://codereview.chromium.org/890523002/ ] 7: [blink] remove modificationTimeMS [ https://codereview.chromium.org/869613005/ ] R=jochen BUG=451747 Review URL: https://codereview.chromium.org/890523002 Cr-Commit-Position: refs/heads/master@{#315545} --- content/child/file_info_util.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/content/child/file_info_util.cc b/content/child/file_info_util.cc index 1afced31bdff..40a11fbce5ac 100644 --- a/content/child/file_info_util.cc +++ b/content/child/file_info_util.cc @@ -13,14 +13,10 @@ void FileInfoToWebFileInfo(const base::File::Info& file_info, blink::WebFileInfo* web_file_info) { DCHECK(web_file_info); // Blink now expects NaN as uninitialized/null Date. - if (file_info.last_modified.is_null()) { + if (file_info.last_modified.is_null()) web_file_info->modificationTime = std::numeric_limits::quiet_NaN(); - web_file_info->modificationTimeMS = - std::numeric_limits::quiet_NaN(); - } else { + else web_file_info->modificationTime = file_info.last_modified.ToJsTime(); - web_file_info->modificationTimeMS = file_info.last_modified.ToJsTime(); - } web_file_info->length = file_info.size; if (file_info.is_directory) web_file_info->type = blink::WebFileInfo::TypeDirectory; -- 2.11.4.GIT