Changeset 200159 in webkit

Timestamp:

Apr 27, 2016 4:32:13 PM (8 years ago)

Author:

Michael Catanzaro

Message:

[SOUP] Implement PlatformCookieJar::addCookie
​https://bugs.webkit.org/show_bug.cgi?id=156295

Reviewed by Carlos Garcia Campos.

• platform/network/soup/CookieJarSoup.cpp:

(WebCore::msToSoupDate):
(WebCore::toSoupCookie):
(WebCore::addCookie):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/CookieJarSoup.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-27  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [SOUP] Implement PlatformCookieJar::addCookie
+        https://bugs.webkit.org/show_bug.cgi?id=156295
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::msToSoupDate):
+        (WebCore::toSoupCookie):
+        (WebCore::addCookie):
+
 2016-04-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp

@@ -29 +29 @@
 #include "URL.h"
 #include "NetworkingContext.h"
-#include "NotImplemented.h"
 #include "PlatformCookieJar.h"
 #include "SoupNetworkSession.h"
+#include <wtf/DateMath.h>
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
@@ -193 +193 @@
 }
 
-void addCookie(const NetworkStorageSession&, const URL&, const Cookie&)
-{
-    // FIXME: implement this command. <https://webkit.org/b/156295>
-    notImplemented();
+static SoupDate* msToSoupDate(double ms)
+{
+    int year = msToYear(ms);
+    int dayOfYear = dayInYear(ms, year);
+    bool leapYear = isLeapYear(year);
+    return soup_date_new(year, monthFromDayInYear(dayOfYear, leapYear), dayInMonthFromDayInYear(dayOfYear, leapYear), msToHours(ms), msToMinutes(ms), static_cast<int>(ms / 1000) % 60);
+}
+
+static SoupCookie* toSoupCookie(const Cookie& cookie)
+{
+    SoupCookie* soupCookie = soup_cookie_new(cookie.name.utf8().data(), cookie.value.utf8().data(),
+        cookie.domain.utf8().data(), cookie.path.utf8().data(), -1);
+    soup_cookie_set_http_only(soupCookie, cookie.httpOnly);
+    soup_cookie_set_secure(soupCookie, cookie.secure);
+    if (!cookie.session) {
+        SoupDate* date = msToSoupDate(cookie.expires);
+        soup_cookie_set_expires(soupCookie, date);
+        soup_date_free(date);
+    }
+    return soupCookie;
+}
+
+void addCookie(const NetworkStorageSession& session, const URL&, const Cookie& cookie)
+{
+    soup_cookie_jar_add_cookie(cookieJarForSession(session), toSoupCookie(cookie));
 }