<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189679] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189679">189679</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-13 21:18:18 -0700 (Sun, 13 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>document.lastModified should use the user's local time zone
https://bugs.webkit.org/show_bug.cgi?id=149092
LayoutTests/imported/w3c:
<rdar://problem/22567705>
Reviewed by Ryosuke Niwa.
Rebaseline a couple of W3C tests now that more checks are passing.
* web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01-expected.txt:
* web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-expected.txt:
Source/WebCore:
<rdar://problem/22567705>
Reviewed by Ryosuke Niwa.
document.lastModified should use the user's local time zone:
https://html.spec.whatwg.org/multipage/dom.html#dom-document-lastmodified
Chrome and Firefox comply with the specification but WebKit was using
UTC. This patch aligns WebKit's behavior with the specification and
other browsers.
No new tests, already covered by existing tests.
* dom/Document.cpp:
(WebCore::Document::lastModified):
(WebCore::Document::setCookieURL): Deleted.
LayoutTests:
Reviewed by Ryosuke Niwa.
Update test so that it converts document.lastModified to UTF before
printing it. This is so that we can consistent layout tests results, no
matter the system's timezone.
* http/tests/misc/last-modified-parsing-expected.txt:
* http/tests/resources/last-modified.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmisclastmodifiedparsingexpectedtxt">trunk/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsresourceslastmodifiedphp">trunk/LayoutTests/http/tests/resources/last-modified.php</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsresourcemetadatamanagementdocumentlastModified01expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsresourcemetadatamanagementdocumentlastModifiedexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/LayoutTests/ChangeLog 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-13 Chris Dumez <cdumez@apple.com>
+
+ document.lastModified should use the user's local time zone
+ https://bugs.webkit.org/show_bug.cgi?id=149092
+
+ Reviewed by Ryosuke Niwa.
+
+ Update test so that it converts document.lastModified to UTF before
+ printing it. This is so that we can consistent layout tests results, no
+ matter the system's timezone.
+
+ * http/tests/misc/last-modified-parsing-expected.txt:
+ * http/tests/resources/last-modified.php:
+
</ins><span class="cx"> 2015-09-13 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmisclastmodifiedparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -3,34 +3,34 @@
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame0-->-->'
</span><span class="cx"> --------
</span><del>-11/21/2008 01:03:33
</del><ins>+Fri, 21 Nov 2008 01:03:33 GMT
</ins><span class="cx">
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame1-->-->'
</span><span class="cx"> --------
</span><del>-11/21/2008 01:03:33
</del><ins>+Fri, 21 Nov 2008 01:03:33 GMT
</ins><span class="cx">
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame2-->-->'
</span><span class="cx"> --------
</span><del>-11/21/1997 01:03:33
</del><ins>+Fri, 21 Nov 1997 01:03:33 GMT
</ins><span class="cx">
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame3-->-->'
</span><span class="cx"> --------
</span><del>-11/21/2008 01:03:33
</del><ins>+Fri, 21 Nov 2008 01:03:33 GMT
</ins><span class="cx">
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame4-->-->'
</span><span class="cx"> --------
</span><del>-02/21/2008 01:03:33
</del><ins>+Thu, 21 Feb 2008 01:03:33 GMT
</ins><span class="cx">
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame5-->-->'
</span><span class="cx"> --------
</span><del>-02/03/2008 01:03:33
</del><ins>+Sun, 03 Feb 2008 01:03:33 GMT
</ins><span class="cx">
</span><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame6-->-->'
</span><span class="cx"> --------
</span><del>-03/03/2008 01:03:33
</del><ins>+Mon, 03 Mar 2008 01:03:33 GMT
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsresourceslastmodifiedphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/resources/last-modified.php (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/resources/last-modified.php 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/LayoutTests/http/tests/resources/last-modified.php 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -3,5 +3,5 @@
</span><span class="cx"> header("Last-Modified: $date");
</span><span class="cx"> ?>
</span><span class="cx"> <script>
</span><del>-document.write(document.lastModified);
</del><ins>+document.write((new Date(document.lastModified)).toUTCString());
</ins><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-09-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ document.lastModified should use the user's local time zone
+ https://bugs.webkit.org/show_bug.cgi?id=149092
+ <rdar://problem/22567705>
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline a couple of W3C tests now that more checks are passing.
+
+ * web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01-expected.txt:
+ * web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-expected.txt:
+
+2015-09-13 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Node.baseURI should not return null for detached nodes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149104
</span><span class="cx"> <rdar://problem/22559535>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsresourcemetadatamanagementdocumentlastModified01expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01-expected.txt (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01-expected.txt 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01-expected.txt 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><del>-FAIL Date returned by lastModified is current at page load assert_true: expected true got false
</del><ins>+PASS Date returned by lastModified is current at page load
</ins><span class="cx"> PASS Date returned by lastModified is in the form "MM/DD/YYYY hh:mm:ss".
</span><del>-FAIL Date returned by lastModified is in the user's local time zone. assert_true: expected true got false
-FAIL Date returned by lastModified is current after timeout. assert_true: expected true got false
</del><ins>+PASS Date returned by lastModified is in the user's local time zone.
+PASS Date returned by lastModified is current after timeout.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsresourcemetadatamanagementdocumentlastModifiedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-expected.txt (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-expected.txt 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-expected.txt 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL lastModified should return the last modified date and time assert_equals: expected "12/31/1969 17:23:45" but got "01/01/1970 01:23:45"
</del><ins>+PASS lastModified should return the last modified date and time
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/Source/WebCore/ChangeLog 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-09-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ document.lastModified should use the user's local time zone
+ https://bugs.webkit.org/show_bug.cgi?id=149092
+ <rdar://problem/22567705>
+
+ Reviewed by Ryosuke Niwa.
+
+ document.lastModified should use the user's local time zone:
+ https://html.spec.whatwg.org/multipage/dom.html#dom-document-lastmodified
+
+ Chrome and Firefox comply with the specification but WebKit was using
+ UTC. This patch aligns WebKit's behavior with the specification and
+ other browsers.
+
+ No new tests, already covered by existing tests.
+
+ * dom/Document.cpp:
+ (WebCore::Document::lastModified):
+ (WebCore::Document::setCookieURL): Deleted.
+
+2015-09-13 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Node.baseURI should not return null for detached nodes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149104
</span><span class="cx"> <rdar://problem/22559535>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (189678 => 189679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-09-14 03:07:48 UTC (rev 189678)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-09-14 04:18:18 UTC (rev 189679)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> #include "XPathResult.h"
</span><span class="cx"> #include "htmlediting.h"
</span><span class="cx"> #include <JavaScriptCore/Profile.h>
</span><ins>+#include <ctime>
</ins><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="lines">@@ -4236,34 +4237,30 @@
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-lastmodified
</span><span class="cx"> String Document::lastModified() const
</span><span class="cx"> {
</span><del>- DateComponents date;
- bool foundDate = false;
- if (m_frame) {
- auto lastModifiedDate = loader() ? loader()->response().lastModified() : Nullopt;
- if (lastModifiedDate) {
- using namespace std::chrono;
- date.setMillisecondsSinceEpochForDateTime(duration_cast<milliseconds>(lastModifiedDate.value().time_since_epoch()).count());
- foundDate = true;
- }
- }
</del><ins>+ using namespace std::chrono;
+ Optional<system_clock::time_point> dateTime;
+ if (m_frame && loader())
+ dateTime = loader()->response().lastModified();
+
</ins><span class="cx"> // FIXME: If this document came from the file system, the HTML5
</span><del>- // specificiation tells us to read the last modification date from the file
</del><ins>+ // specification tells us to read the last modification date from the file
</ins><span class="cx"> // system.
</span><del>- if (!foundDate) {
- double fallbackDate = currentTimeMS();
</del><ins>+ if (!dateTime) {
+ dateTime = system_clock::now();
</ins><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> InputCursor& cursor = inputCursor();
</span><span class="cx"> if (cursor.isCapturing())
</span><del>- cursor.appendInput<DocumentLastModifiedDate>(fallbackDate);
</del><ins>+ cursor.appendInput<DocumentLastModifiedDate>(duration_cast<milliseconds>(dateTime.value().time_since_epoch()).count());
</ins><span class="cx"> else if (cursor.isReplaying()) {
</span><span class="cx"> if (DocumentLastModifiedDate* input = cursor.fetchInput<DocumentLastModifiedDate>())
</span><del>- fallbackDate = input->fallbackValue();
</del><ins>+ dateTime = system_clock::time_point(milliseconds(static_cast<long long>(input->fallbackValue())));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- date.setMillisecondsSinceEpochForDateTime(fallbackDate);
</del><span class="cx"> }
</span><span class="cx">
</span><del>- return String::format("%02d/%02d/%04d %02d:%02d:%02d", date.month() + 1, date.monthDay(), date.fullYear(), date.hour(), date.minute(), date.second());
</del><ins>+ auto ctime = system_clock::to_time_t(dateTime.value());
+ auto localDateTime = std::localtime(&ctime);
+ return String::format("%02d/%02d/%04d %02d:%02d:%02d", localDateTime->tm_mon + 1, localDateTime->tm_mday, 1900 + localDateTime->tm_year, localDateTime->tm_hour, localDateTime->tm_min, localDateTime->tm_sec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setCookieURL(const URL& url)
</span></span></pre>
</div>
</div>
</body>
</html>