Changeset 84373 in webkit

Timestamp:

Apr 20, 2011 7:46:52 AM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

[Qt] Clean the style of our cookie methods
​https://bugs.webkit.org/show_bug.cgi?id=58987

Reviewed by Andreas Kling.

Got rid of the variables named "u" in favor just converting the url when needed.

• platform/qt/CookieJarQt.cpp:

(WebCore::setCookies): The variable p was unused.
The ::toAscii() depends on the default codec, use toLatin1() instead.
(WebCore::cookies): foreach() should use const reference.
(WebCore::cookieRequestHeaderFieldValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/CookieJarQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Clean the style of our cookie methods
+        https://bugs.webkit.org/show_bug.cgi?id=58987
+
+        Got rid of the variables named "u" in favor just converting the url when needed.
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::setCookies): The variable p was unused.
+        The ::toAscii() depends on the default codec, use toLatin1() instead.
+        (WebCore::cookies): foreach() should use const reference.
+        (WebCore::cookieRequestHeaderFieldValue):
+
 2011-04-19  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebCore/platform/qt/CookieJarQt.cpp

@@ -60 +60 @@
 void setCookies(Document* document, const KURL& url, const String& value)
 {
-    QUrl u(url);
-    QUrl p(document->firstPartyForCookies());
     QNetworkCookieJar* jar = cookieJar(document);
     if (!jar)
         return;
 
-    QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(QString(value).toAscii());
+    QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(QString(value).toLatin1());
     QList<QNetworkCookie>::Iterator it = cookies.begin();
     while (it != cookies.end()) {
@@ -74 +72 @@
             ++it;
     }
-    jar->setCookiesFromUrl(cookies, u);
+    jar->setCookiesFromUrl(cookies, QUrl(url));
 }
 
 String cookies(const Document* document, const KURL& url)
 {
-    QUrl u(url);
     QNetworkCookieJar* jar = cookieJar(document);
     if (!jar)
         return String();
 
-    QList<QNetworkCookie> cookies = jar->cookiesForUrl(u);
+    QList<QNetworkCookie> cookies = jar->cookiesForUrl(QUrl(url));
     if (cookies.isEmpty())
         return String();
 
     QStringList resultCookies;
-    foreach (QNetworkCookie networkCookie, cookies) {
+    foreach (const QNetworkCookie& networkCookie, cookies) {
         if (networkCookie.isHttpOnly())
             continue;
@@ -100 +97 @@
 String cookieRequestHeaderFieldValue(const Document* document, const KURL &url)
 {
-    QUrl u(url);
     QNetworkCookieJar* jar = cookieJar(document);
     if (!jar)
         return String();
 
-    QList<QNetworkCookie> cookies = jar->cookiesForUrl(u);
+    QList<QNetworkCookie> cookies = jar->cookiesForUrl(QUrl(url));
     if (cookies.isEmpty())
         return String();