[webkit-changes] [138421] trunk/Source/WebCore

Sun, 23 Dec 2012 09:03:10 -0800

Title: [138421] trunk/Source/WebCore
Revision
138421
Author
t...@chromium.org
Date
2012-12-23 09:04:55 -0800 (Sun, 23 Dec 2012)

Log Message

[Qt][Mac] Unreviewed fix the build after r138413
https://bugs.webkit.org/show_bug.cgi?id=105686

Don't use a temporary const reference so the compiler doesn't make a copy.
An example compile error (clang):
Source/WebCore/loader/CookieJar.cpp:73:67: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor
    return platformStrategies()->cookiesStrategy()->cookiesForDOM(SESSION(document), document->firstPartyForCookies(), url);


* loader/CookieJar.cpp:
(WebCore::cookies):
(WebCore::setCookies):
(WebCore::cookiesEnabled):
(WebCore::cookieRequestHeaderFieldValue):
(WebCore::getRawCookies):
(WebCore::deleteCookie):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (138420 => 138421)


--- trunk/Source/WebCore/ChangeLog	2012-12-23 14:59:04 UTC (rev 138420)
+++ trunk/Source/WebCore/ChangeLog	2012-12-23 17:04:55 UTC (rev 138421)
@@ -1,3 +1,21 @@
+2012-12-23  Tony Chang  <t...@chromium.org>
+
+        [Qt][Mac] Unreviewed fix the build after r138413
+        https://bugs.webkit.org/show_bug.cgi?id=105686
+
+        Don't use a temporary const reference so the compiler doesn't make a copy.
+        An example compile error (clang):
+        Source/WebCore/loader/CookieJar.cpp:73:67: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor
+            return platformStrategies()->cookiesStrategy()->cookiesForDOM(SESSION(document), document->firstPartyForCookies(), url);
+
+        * loader/CookieJar.cpp:
+        (WebCore::cookies):
+        (WebCore::setCookies):
+        (WebCore::cookiesEnabled):
+        (WebCore::cookieRequestHeaderFieldValue):
+        (WebCore::getRawCookies):
+        (WebCore::deleteCookie):
+
 2012-12-22  Alexey Proskuryakov  <a...@apple.com>
 
         Add a separate class for networking related storage

Modified: trunk/Source/WebCore/loader/CookieJar.cpp (138420 => 138421)


--- trunk/Source/WebCore/loader/CookieJar.cpp	2012-12-23 14:59:04 UTC (rev 138420)
+++ trunk/Source/WebCore/loader/CookieJar.cpp	2012-12-23 17:04:55 UTC (rev 138421)
@@ -62,62 +62,68 @@
     NetworkingContext* context = networkingContext(document);
     return context ? context->storageSession() : NetworkStorageSession::defaultStorageSession();
 }
-#define SESSION(document) storageSession(document)
+#define LOCAL_SESSION(document) NetworkStorageSession& session = storageSession(document);
 #else
-#define SESSION(document) NetworkStorageSession(networkingContext(document))
+#define LOCAL_SESSION(document) NetworkStorageSession session(networkingContext(document));
 #endif
 
 String cookies(const Document* document, const KURL& url)
 {
+    LOCAL_SESSION(document)
 #if USE(PLATFORM_STRATEGIES)
-    return platformStrategies()->cookiesStrategy()->cookiesForDOM(SESSION(document), document->firstPartyForCookies(), url);
+    return platformStrategies()->cookiesStrategy()->cookiesForDOM(session, document->firstPartyForCookies(), url);
 #else
-    return cookiesForDOM(SESSION(document), document->firstPartyForCookies(), url);
+    return cookiesForDOM(session, document->firstPartyForCookies(), url);
 #endif
 }
 
 void setCookies(Document* document, const KURL& url, const String& cookieString)
 {
+    LOCAL_SESSION(document)
 #if USE(PLATFORM_STRATEGIES)
-    platformStrategies()->cookiesStrategy()->setCookiesFromDOM(SESSION(document), document->firstPartyForCookies(), url, cookieString);
+    platformStrategies()->cookiesStrategy()->setCookiesFromDOM(session, document->firstPartyForCookies(), url, cookieString);
 #else
-    setCookiesFromDOM(SESSION(document), document->firstPartyForCookies(), url, cookieString);
+    setCookiesFromDOM(session, document->firstPartyForCookies(), url, cookieString);
 #endif
 }
 
 bool cookiesEnabled(const Document* document)
 {
+    LOCAL_SESSION(document)
 #if USE(PLATFORM_STRATEGIES)
-    return platformStrategies()->cookiesStrategy()->cookiesEnabled(SESSION(document), document->firstPartyForCookies(), document->cookieURL());
+    return platformStrategies()->cookiesStrategy()->cookiesEnabled(session, document->firstPartyForCookies(), document->cookieURL());
 #else
-    return cookiesEnabled(SESSION(document), document->firstPartyForCookies(), document->cookieURL());
+    return cookiesEnabled(session, document->firstPartyForCookies(), document->cookieURL());
 #endif
 }
 
 String cookieRequestHeaderFieldValue(const Document* document, const KURL& url)
 {
+    LOCAL_SESSION(document)
 #if USE(PLATFORM_STRATEGIES)
-    return platformStrategies()->cookiesStrategy()->cookieRequestHeaderFieldValue(SESSION(document), document->firstPartyForCookies(), url);
+    return platformStrategies()->cookiesStrategy()->cookieRequestHeaderFieldValue(session, document->firstPartyForCookies(), url);
 #else
-    return cookieRequestHeaderFieldValue(SESSION(document), document->firstPartyForCookies(), url);
+    return cookieRequestHeaderFieldValue(session, document->firstPartyForCookies(), url);
 #endif
 }
 
 bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& cookies)
 {
+    LOCAL_SESSION(document)
 #if USE(PLATFORM_STRATEGIES)
-    return platformStrategies()->cookiesStrategy()->getRawCookies(SESSION(document), document->firstPartyForCookies(), url, cookies);
+    return platformStrategies()->cookiesStrategy()->getRawCookies(session, document->firstPartyForCookies(), url, cookies);
 #else
-    return getRawCookies(SESSION(document), document->firstPartyForCookies(), url, cookies);
+    return getRawCookies(session, document->firstPartyForCookies(), url, cookies);
 #endif
 }
 
 void deleteCookie(const Document* document, const KURL& url, const String& cookieName)
 {
+    LOCAL_SESSION(document)
 #if USE(PLATFORM_STRATEGIES)
-    platformStrategies()->cookiesStrategy()->deleteCookie(SESSION(document), url, cookieName);
+    platformStrategies()->cookiesStrategy()->deleteCookie(session, url, cookieName);
 #else
-    deleteCookie(SESSION(document), url, cookieName);
+    deleteCookie(session, url, cookieName);
 #endif
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to