[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
darin at chromium.org
darin at chromium.org
Wed Mar 17 18:03:18 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ffa0956be417d8268e9579657003d2759669c67b
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 26 21:40:44 2010 +0000
2010-02-26 Darin Fisher <darin at chromium.org>
Fix mac warning (that gets treated as an error in the chromium build).
* src/ChromiumBridge.cpp:
(WebCore::ChromiumBridge::cookiesEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d79e55e..a600572 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-26 Darin Fisher <darin at chromium.org>
+
+ Fix mac warning (that gets treated as an error in the chromium build).
+
+ * src/ChromiumBridge.cpp:
+ (WebCore::ChromiumBridge::cookiesEnabled):
+
2010-02-25 Darin Fisher <darin at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index d1a4141..2097e21 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -247,7 +247,7 @@ void ChromiumBridge::deleteCookie(const Document* document, const KURL& url, con
bool ChromiumBridge::cookiesEnabled(const Document* document)
{
- bool result;
+ bool result = false;
WebCookieJar* cookieJar = getCookieJar(document);
if (cookieJar)
result = cookieJar->cookiesEnabled(document->cookieURL(), document->firstPartyForCookies());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list