<!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>[129502] trunk/Source/WebCore</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/129502">129502</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2012-09-25 07:07:08 -0700 (Tue, 25 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Cookie info in Network Resources Cookies tab shows &quot;Invalid Date&quot;
https://bugs.webkit.org/show_bug.cgi?id=97471

Patch by Otto Derek Cheung &lt;otcheung@rim.com&gt; on 2012-09-25
Reviewed by Yury Semikhatsky.

The original implementation is trying to create a new Date object
using another Date object, which is invalid. Also, Date.toGMTString is
deprecated.

The fix replaces toGMTString with toUTCString and fixes cookie.expire
so it won't crash when an empty requestDate is passed in.

Following RFC 6265, Max-age attributes now take precedence over expiresi
attribute in CookieParser.

Manual testing on inspector to make sure the CookiesTable is properly generated.

* inspector/front-end/CookieParser.js:
(WebInspector.Cookie.prototype.expires):
* inspector/front-end/CookiesTable.js:
(WebInspector.CookiesTable.prototype._createGridNode):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendCookieParserjs">trunk/Source/WebCore/inspector/front-end/CookieParser.js</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendCookiesTablejs">trunk/Source/WebCore/inspector/front-end/CookiesTable.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (129501 => 129502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-25 14:00:40 UTC (rev 129501)
+++ trunk/Source/WebCore/ChangeLog        2012-09-25 14:07:08 UTC (rev 129502)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2012-09-25  Otto Derek Cheung  &lt;otcheung@rim.com&gt;
+
+        Web Inspector: Cookie info in Network Resources Cookies tab shows &quot;Invalid Date&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=97471
+
+        Reviewed by Yury Semikhatsky.
+
+        The original implementation is trying to create a new Date object
+        using another Date object, which is invalid. Also, Date.toGMTString is
+        deprecated.
+
+        The fix replaces toGMTString with toUTCString and fixes cookie.expire
+        so it won't crash when an empty requestDate is passed in.
+
+        Following RFC 6265, Max-age attributes now take precedence over expiresi
+        attribute in CookieParser.
+
+        Manual testing on inspector to make sure the CookiesTable is properly generated.
+
+        * inspector/front-end/CookieParser.js:
+        (WebInspector.Cookie.prototype.expires):
+        * inspector/front-end/CookiesTable.js:
+        (WebInspector.CookiesTable.prototype._createGridNode):
+
</ins><span class="cx"> 2012-09-25  Keishi Hattori  &lt;keishi@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [Chromium] Enable datalist UI for input type=date
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendCookieParserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/CookieParser.js (129501 => 129502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/CookieParser.js        2012-09-25 14:00:40 UTC (rev 129501)
+++ trunk/Source/WebCore/inspector/front-end/CookieParser.js        2012-09-25 14:07:08 UTC (rev 129502)
</span><span class="lines">@@ -255,8 +255,16 @@
</span><span class="cx">      */ 
</span><span class="cx">     expires: function(requestDate)
</span><span class="cx">     {
</span><del>-        return this._attributes[&quot;expires&quot;] ? new Date(this._attributes[&quot;expires&quot;]) :
-            (this._attributes[&quot;max-age&quot;] ? new Date(requestDate.getTime() + 1000 * this._attributes[&quot;max-age&quot;]) : null);
</del><ins>+        // RFC 6265 indicates that the max-age attribute takes precedence over the expires attribute
+        if (this._attributes[&quot;max-age&quot;]) {
+            var targetDate = requestDate === null ? new Date() : requestDate;
+            return new Date(targetDate.getTime() + 1000 * this._attributes[&quot;max-age&quot;]);
+        }
+
+        if (this._attributes[&quot;expires&quot;])
+            return new Date(this._attributes[&quot;expires&quot;]);
+
+        return null;
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     /**
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendCookiesTablejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/CookiesTable.js (129501 => 129502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/CookiesTable.js        2012-09-25 14:00:40 UTC (rev 129501)
+++ trunk/Source/WebCore/inspector/front-end/CookiesTable.js        2012-09-25 14:07:08 UTC (rev 129502)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">         data[2] = cookie.domain || &quot;&quot;;
</span><span class="cx">         data[3] = cookie.path || &quot;&quot;;
</span><span class="cx">         data[4] = cookie.type === WebInspector.Cookie.Type.Request ? &quot;&quot; :
</span><del>-            (cookie.session ? WebInspector.UIString(&quot;Session&quot;) : new Date(cookie.expires).toGMTString());
</del><ins>+            (cookie.session ? WebInspector.UIString(&quot;Session&quot;) : cookie.expires().toUTCString());
</ins><span class="cx">         data[5] = cookie.size;
</span><span class="cx">         const checkmark = &quot;\u2713&quot;;
</span><span class="cx">         data[6] = (cookie.httpOnly ? checkmark : &quot;&quot;);
</span></span></pre>
</div>
</div>

</body>
</html>