[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ap at apple.com
ap at apple.com
Wed Dec 22 14:54:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cfa90102ed9db6c73682bd23874e3369e76d9f1c
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 22:32:26 2010 +0000
Windows build fix.
* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::setCookieStoragePrivateBrowsingEnabled): It's adoptCF, not adoptPtr.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9bdf778..3b19e71 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-10-23 Alexey Proskuryakov <ap at apple.com>
+ Windows build fix.
+
+ * platform/network/cf/CookieStorageCFNet.cpp:
+ (WebCore::setCookieStoragePrivateBrowsingEnabled): It's adoptCF, not adoptPtr.
+
+2010-10-23 Alexey Proskuryakov <ap at apple.com>
+
Reviewed by Anders Carlsson.
https://bugs.webkit.org/show_bug.cgi?id=48083
diff --git a/WebCore/platform/network/cf/CookieStorageCFNet.cpp b/WebCore/platform/network/cf/CookieStorageCFNet.cpp
index f407899..d81af4d 100644
--- a/WebCore/platform/network/cf/CookieStorageCFNet.cpp
+++ b/WebCore/platform/network/cf/CookieStorageCFNet.cpp
@@ -55,7 +55,7 @@ void setCookieStoragePrivateBrowsingEnabled(bool enabled)
ASSERT(isMainThread());
if (enabled)
- s_cookieStorage.adoptPtr(wkCreatePrivateHTTPCookieStorage());
+ s_cookieStorage.adoptCF(wkCreatePrivateHTTPCookieStorage());
else
s_cookieStorage = 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list