Title: [125421] trunk/Source/WebKit2
- Revision
- 125421
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-13 09:36:43 -0700 (Mon, 13 Aug 2012)
Log Message
[SOUP][WK2] Missing LocalTerminationDisabler in WebCookieManager::setCookiePersistentStorage()
https://bugs.webkit.org/show_bug.cgi?id=93837
Patch by Christophe Dumez <christophe.du...@intel.com> on 2012-08-13
Reviewed by Carlos Garcia Campos.
Add missing WebCore::LocalTerminationDisabler in
WebCookieManager::setCookiePersistentStorage() to
temporarily disable process termination.
* WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
(WebKit::WebCookieManager::setCookiePersistentStorage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125420 => 125421)
--- trunk/Source/WebKit2/ChangeLog 2012-08-13 15:50:37 UTC (rev 125420)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-13 16:36:43 UTC (rev 125421)
@@ -1,3 +1,17 @@
+2012-08-13 Christophe Dumez <christophe.du...@intel.com>
+
+ [SOUP][WK2] Missing LocalTerminationDisabler in WebCookieManager::setCookiePersistentStorage()
+ https://bugs.webkit.org/show_bug.cgi?id=93837
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add missing WebCore::LocalTerminationDisabler in
+ WebCookieManager::setCookiePersistentStorage() to
+ temporarily disable process termination.
+
+ * WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
+ (WebKit::WebCookieManager::setCookiePersistentStorage):
+
2012-08-12 Nuno Lopes <nlo...@apple.com>
Fix build with recent clang.
Modified: trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp (125420 => 125421)
--- trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp 2012-08-13 15:50:37 UTC (rev 125420)
+++ trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp 2012-08-13 16:36:43 UTC (rev 125421)
@@ -27,6 +27,7 @@
#include "WebCookieManager.h"
#include "WebKitSoupCookieJarSqlite.h"
+#include "WebProcess.h"
#include <WebCore/CookieJarSoup.h>
#include <WebCore/ResourceHandle.h>
#include <libsoup/soup.h>
@@ -83,6 +84,8 @@
void WebCookieManager::setCookiePersistentStorage(const String& storagePath, uint32_t storageType)
{
+ WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared());
+
GRefPtr<SoupCookieJar> jar;
switch (storageType) {
case SoupCookiePersistentStorageText:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
