[BlackBerry] Web Inspector cookie expiry is showing the wrong date.

https://bugs.webkit.org/show_bug.cgi?id=83814

Patch by Konrad Piascik <kpiascik@rim.com> on 2012-04-12
Reviewed by Rob Buis.

The internal representation for expiry is seconds, we need to convert it
to milliseconds by multiplying by 1000.

The value from this method doesn't get used anywhere except Web Inspector.
Manually tested with Web Inspector by examining the CookieItemView in the Resources Panel.

* platform/blackberry/ParsedCookie.cpp:
(WebCore::ParsedCookie::appendWebCoreCookie):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 98fbb33..e0aef64 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-12  Konrad Piascik  <kpiascik@rim.com>
+
+        [BlackBerry] Web Inspector cookie expiry is showing the wrong date.
+        https://bugs.webkit.org/show_bug.cgi?id=83814
+
+        Reviewed by Rob Buis.
+
+        The internal representation for expiry is seconds, we need to convert it
+        to milliseconds by multiplying by 1000.
+
+        The value from this method doesn't get used anywhere except Web Inspector.
+        Manually tested with Web Inspector by examining the CookieItemView in the Resources Panel.
+
+        * platform/blackberry/ParsedCookie.cpp:
+        (WebCore::ParsedCookie::appendWebCoreCookie):
+
 2012-04-12  Adam Klein  <adamk@chromium.org>
 
         Always set V8 wrappers via V8DOMWrapper::setJSWrapperFor* instead of WeakReferenceMap::set()

diff --git a/Source/WebCore/platform/blackberry/ParsedCookie.cpp b/Source/WebCore/platform/blackberry/ParsedCookie.cpp
index 145c079..4785e49 100644 (file)
--- a/Source/WebCore/platform/blackberry/ParsedCookie.cpp
+++ b/Source/WebCore/platform/blackberry/ParsedCookie.cpp
@@ -181,6 +181,8 @@ String ParsedCookie::toNameValuePair() const
 void ParsedCookie::appendWebCoreCookie(Vector<Cookie>& cookieVector) const
 {
     cookieVector.append(Cookie(String(m_name), String(m_value), String(m_domain),
-            String(m_path), m_expiry, m_isHttpOnly, m_isSecure, m_isSession));
+            // We multiply m_expiry by 1000 to convert from seconds to milliseconds.
+            // This value is passed to Web Inspector and used in the JavaScript Date constructor.
+            String(m_path), (m_expiry * 1000), m_isHttpOnly, m_isSecure, m_isSession));
 }
 } // namespace WebCore