[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 3947a3a011e2afbb5e9e6d02abd9b8f13b192373
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 9 00:47:40 2011 +0000

    2011-01-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] CookieJarQt.cpp has coding-style errors
            https://bugs.webkit.org/show_bug.cgi?id=39778
    
            Improve the coding style of CookieJarQt.cpp.
    
            * platform/qt/CookieJarQt.cpp:
            (WebCore::networkAccessManager):
            (WebCore::cookiesEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c84ad40..04ec2f4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] CookieJarQt.cpp has coding-style errors
+        https://bugs.webkit.org/show_bug.cgi?id=39778
+
+        Improve the coding style of CookieJarQt.cpp.
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::networkAccessManager):
+        (WebCore::cookiesEnabled):
+
 2011-01-08  Jeff Miller  <jeffm at apple.com>
 
         Rubber-stamped by Dan Bernstein.
diff --git a/Source/WebCore/platform/qt/CookieJarQt.cpp b/Source/WebCore/platform/qt/CookieJarQt.cpp
index e5d36ba..53e39b9 100644
--- a/Source/WebCore/platform/qt/CookieJarQt.cpp
+++ b/Source/WebCore/platform/qt/CookieJarQt.cpp
@@ -30,14 +30,13 @@
 
 #include "Cookie.h"
 #include "Document.h"
+#include "FrameLoaderClientQt.h"
 #include "KURL.h"
-#include "QtNAMThreadSafeProxy.h"
 #include "NetworkingContext.h"
 #include "PlatformString.h"
-
-#include "qwebpage.h"
+#include "QtNAMThreadSafeProxy.h"
 #include "qwebframe.h"
-#include "FrameLoaderClientQt.h"
+#include "qwebpage.h"
 #include <QNetworkAccessManager>
 #include <QNetworkCookie>
 #include <QStringList>
@@ -49,10 +48,10 @@ static QNetworkAccessManager *networkAccessManager(const Document *document)
 {
     if (!document)
         return 0;
-    Frame *frame = document->frame();
+    Frame* frame = document->frame();
     if (!frame)
         return 0;
-    FrameLoader *loader = frame->loader();
+    FrameLoader* loader = frame->loader();
     if (!loader)
         return 0;
     return loader->networkingContext()->networkAccessManager();
@@ -115,7 +114,7 @@ String cookieRequestHeaderFieldValue(const Document* document, const KURL &url)
 
 bool cookiesEnabled(const Document* document)
 {
-    return networkAccessManager(document);
+    return !!networkAccessManager(document);
 }
 
 bool getRawCookies(const Document*, const KURL&, Vector<Cookie>& rawCookies)

-- 
WebKit Debian packaging