Diff
Modified: trunk/Source/WebCore/ChangeLog (133523 => 133524)
--- trunk/Source/WebCore/ChangeLog 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/ChangeLog 2012-11-05 22:07:46 UTC (rev 133524)
@@ -1,3 +1,43 @@
+2012-11-05 Alexey Proskuryakov <[email protected]>
+
+ Get rid of setCookieStoragePrivateBrowsingEnabled.
+ https://bugs.webkit.org/show_bug.cgi?id=101247
+
+ Reviewed by Brady Eidson.
+
+ We were only doing anything here on Mac, and only because we couldn't know if
+ sessions were in use. But sessions are always in use, and those obsolete changing
+ cookie storage explicitly.
+
+ * platform/network/win/CookieStorageWin.cpp: Removed.
+ * PlatformWinCE.cmake:
+ * WebCore.gypi:
+ No more CookieStorageWin.cpp with an empty implementation.
+
+ * WebCore.exp.in:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ We no longer need this WKSI function.
+
+ * page/Settings.cpp: (WebCore::Settings::setPrivateBrowsingEnabled):
+ Removed the only call to setCookieStoragePrivateBrowsingEnabled().
+
+ * platform/network/CookieStorage.h:
+ * platform/network/cf/CookieStorageCFNet.cpp:
+ * platform/network/curl/CookieJarCurl.cpp:
+ * platform/network/soup/CookieStorageSoup.cpp:
+ * platform/qt/TemporaryLinkStubsQt.cpp:
+ Removed empty setCookieStoragePrivateBrowsingEnabled implementations.
+
+ * platform/network/mac/CookieStorageMac.mm: This function used to have a FIXME
+ that we should observe private storage while in private browsing mode. I don't think
+ that it was correct - Safari doesn't display content of private storage, and thus
+ doesn't need to know about changes.
+ The removal of this function has an effect on WebKit1 clients that enable private
+ browsing. We used to globally change cookie storage, even for loads not initiated
+ by WebKit. Now we match API description: "If private browsing is enabled, WebKit
+ will not store information about sites the user visits."
+
2012-11-05 Florin Malita <[email protected]>
Crash when mixing layers, foreignObjects and SVG hidden containers
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (133523 => 133524)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2012-11-05 22:07:46 UTC (rev 133524)
@@ -80,7 +80,6 @@
platform/network/win/CredentialStorageWin.cpp
platform/network/win/CookieJarWin.cpp
- platform/network/win/CookieStorageWin.cpp
platform/network/win/NetworkStateNotifierWin.cpp
platform/network/win/ProxyServerWin.cpp
platform/network/win/ResourceHandleWin.cpp
Modified: trunk/Source/WebCore/WebCore.exp.in (133523 => 133524)
--- trunk/Source/WebCore/WebCore.exp.in 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-11-05 22:07:46 UTC (rev 133524)
@@ -1536,7 +1536,6 @@
_wkSetCFURLResponseMIMEType
_wkSetCONNECTProxyAuthorizationForStream
_wkSetCONNECTProxyForStream
-_wkSetCookieStoragePrivateBrowsingEnabled
_wkSetHTTPCookieAcceptPolicy
_wkSetHTTPCookiesForURL
_wkSetHTTPPipeliningMaximumPriority
Modified: trunk/Source/WebCore/WebCore.gypi (133523 => 133524)
--- trunk/Source/WebCore/WebCore.gypi 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/WebCore.gypi 2012-11-05 22:07:46 UTC (rev 133524)
@@ -5659,7 +5659,6 @@
'platform/network/soup/SoupURIUtils.h',
'platform/network/win/AuthenticationChallenge.h',
'platform/network/win/CookieJarWin.cpp',
- 'platform/network/win/CookieStorageWin.cpp',
'platform/network/win/DownloadBundleWin.cpp',
'platform/network/win/NetworkStateNotifierWin.cpp',
'platform/network/win/ProxyServerWin.cpp',
Modified: trunk/Source/WebCore/page/Settings.cpp (133523 => 133524)
--- trunk/Source/WebCore/page/Settings.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -593,7 +593,6 @@
#if PLATFORM(MAC) || USE(CFNETWORK)
ResourceHandle::setPrivateBrowsingEnabled(privateBrowsingEnabled);
#endif
- setCookieStoragePrivateBrowsingEnabled(privateBrowsingEnabled);
if (m_privateBrowsingEnabled == privateBrowsingEnabled)
return;
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (133523 => 133524)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-11-05 22:07:46 UTC (rev 133524)
@@ -193,7 +193,6 @@
extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
extern void (*wkQTClearMediaDownloadCache)();
extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
-extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (133523 => 133524)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2012-11-05 22:07:46 UTC (rev 133524)
@@ -86,7 +86,6 @@
void (*wkQTClearMediaDownloadCache)();
void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
-void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
void (*wkSetDragImage)(NSImage*, NSPoint offset);
void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform);
void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
Modified: trunk/Source/WebCore/platform/network/CookieStorage.h (133523 => 133524)
--- trunk/Source/WebCore/platform/network/CookieStorage.h 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/network/CookieStorage.h 2012-11-05 22:07:46 UTC (rev 133524)
@@ -30,7 +30,7 @@
namespace WebCore {
-void setCookieStoragePrivateBrowsingEnabled(bool);
+// These are always observing the main cookie storage, even when in private browsing mode.
void startObservingCookieChanges();
void stopObservingCookieChanges();
Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (133523 => 133524)
--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -83,16 +83,6 @@
cookieStorageOverride().adoptCF(cookieStorage);
}
-void setCookieStoragePrivateBrowsingEnabled(bool)
-{
- ASSERT(isMainThread());
-
- // Nothing to do here - we'll just use a private session from ResourceHandle.
-
- // FIXME: When Private Browsing is enabled, the Private Browsing Cookie Storage should be
- // observed for changes, not the default Cookie Storage.
-}
-
static void notifyCookiesChangedOnMainThread(void*)
{
ASSERT(isMainThread());
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp (133523 => 133524)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -61,13 +61,6 @@
// FIXME: Not yet implemented
}
-#if !PLATFORM(EFL)
-void setCookieStoragePrivateBrowsingEnabled(bool enabled)
-{
- // FIXME: Not yet implemented
-}
-#endif
-
void getHostnamesWithCookies(HashSet<String>& hostnames)
{
// FIXME: Not yet implemented
Modified: trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm (133523 => 133524)
--- trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm 2012-11-05 22:07:46 UTC (rev 133524)
@@ -77,16 +77,6 @@
namespace WebCore {
-void setCookieStoragePrivateBrowsingEnabled(bool enabled)
-{
- // FIXME: When Private Browsing is enabled, the Private Browsing Cookie Storage should be
- // observed for changes, not the default Cookie Storage.
-
- // There is nothing to do here if sessions are supported. But we don't know if they are,
- // so enable legacy private browsing mode on sharedHTTPCookieStorage, too.
- wkSetCookieStoragePrivateBrowsingEnabled(enabled);
-}
-
static WebCookieStorageObjCAdapter *cookieStorageAdapter;
void startObservingCookieChanges()
Modified: trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp (133523 => 133524)
--- trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/network/soup/CookieStorageSoup.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -31,11 +31,6 @@
namespace WebCore {
-void setCookieStoragePrivateBrowsingEnabled(bool)
-{
- notImplemented();
-}
-
#if USE(PLATFORM_STRATEGIES)
static void soupCookiesChanged(SoupCookieJar* jar, SoupCookie*, SoupCookie*, gpointer)
{
Deleted: trunk/Source/WebCore/platform/network/win/CookieStorageWin.cpp (133523 => 133524)
--- trunk/Source/WebCore/platform/network/win/CookieStorageWin.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/network/win/CookieStorageWin.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Patrick Gansterer <[email protected]>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CookieStorage.h"
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-void setCookieStoragePrivateBrowsingEnabled(bool)
-{
- notImplemented();
-}
-
-} // namespace WebCore
Modified: trunk/Source/WebCore/platform/qt/TemporaryLinkStubsQt.cpp (133523 => 133524)
--- trunk/Source/WebCore/platform/qt/TemporaryLinkStubsQt.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebCore/platform/qt/TemporaryLinkStubsQt.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -88,10 +88,6 @@
return false;
}
-void PluginView::privateBrowsingStateChanged(bool)
-{
-}
-
PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
{
return 0;
Modified: trunk/Source/WebKit/mac/ChangeLog (133523 => 133524)
--- trunk/Source/WebKit/mac/ChangeLog 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-11-05 22:07:46 UTC (rev 133524)
@@ -1,3 +1,13 @@
+2012-11-05 Alexey Proskuryakov <[email protected]>
+
+ Get rid of setCookieStoragePrivateBrowsingEnabled.
+ https://bugs.webkit.org/show_bug.cgi?id=101247
+
+ Reviewed by Brady Eidson.
+
+ * WebCoreSupport/WebSystemInterface.mm: (InitWebCoreSystemInterface): We no longer
+ have this function.
+
2012-11-03 Alexey Proskuryakov <[email protected]>
Get rid of USE(CFURLSTORAGESESSIONS)
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (133523 => 133524)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2012-11-05 22:07:46 UTC (rev 133524)
@@ -93,7 +93,6 @@
INIT(SetCGFontRenderingMode);
INIT(SetCONNECTProxyAuthorizationForStream);
INIT(SetCONNECTProxyForStream);
- INIT(SetCookieStoragePrivateBrowsingEnabled);
INIT(SetDragImage);
INIT(SetHTTPPipeliningMaximumPriority);
INIT(SetHTTPPipeliningPriority);
Modified: trunk/Source/WebKit2/ChangeLog (133523 => 133524)
--- trunk/Source/WebKit2/ChangeLog 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-05 22:07:46 UTC (rev 133524)
@@ -1,3 +1,16 @@
+2012-11-05 Alexey Proskuryakov <[email protected]>
+
+ Get rid of setCookieStoragePrivateBrowsingEnabled.
+ https://bugs.webkit.org/show_bug.cgi?id=101247
+
+ Reviewed by Brady Eidson.
+
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::switchNetworkLoaderToNewTestingSession): Added a FIXME.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: (InitWebCoreSystemInterface):
+ We no longer have this function.
+
2012-11-05 Simon Fraser <[email protected]>
Fix layer borders to cleaning appear and disappear on switching
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (133523 => 133524)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-11-05 22:07:46 UTC (rev 133524)
@@ -285,6 +285,7 @@
{
#if PLATFORM(MAC) || USE(CFNETWORK)
// Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
+ // FIXME (NetworkProcess): Do this in network process, too.
RetainPtr<CFURLStorageSessionRef> session = ResourceHandle::createPrivateBrowsingStorageSession(CFSTR("Private WebKit Session"));
ResourceHandle::setDefaultStorageSession(session.get());
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (133523 => 133524)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2012-11-05 22:07:46 UTC (rev 133524)
@@ -100,7 +100,6 @@
INIT(SetCGFontRenderingMode);
INIT(SetCONNECTProxyAuthorizationForStream);
INIT(SetCONNECTProxyForStream);
- INIT(SetCookieStoragePrivateBrowsingEnabled);
INIT(SetDragImage);
INIT(SetHTTPPipeliningMaximumPriority);
INIT(SetHTTPPipeliningPriority);
Modified: trunk/WebKitLibraries/ChangeLog (133523 => 133524)
--- trunk/WebKitLibraries/ChangeLog 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/WebKitLibraries/ChangeLog 2012-11-05 22:07:46 UTC (rev 133524)
@@ -1,3 +1,12 @@
+2012-11-05 Alexey Proskuryakov <[email protected]>
+
+ Get rid of setCookieStoragePrivateBrowsingEnabled.
+ https://bugs.webkit.org/show_bug.cgi?id=101247
+
+ Reviewed by Brady Eidson.
+
+ * WebKitSystemInterface.h: Removed the function.
+
2012-11-02 Anders Carlsson <[email protected]>
Don't instantiate the Java plug-in if it's inactive
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (133523 => 133524)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2012-11-05 22:03:56 UTC (rev 133523)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2012-11-05 22:07:46 UTC (rev 133524)
@@ -68,8 +68,6 @@
Class WKNSURLProtocolClassForRequest(NSURLRequest *request);
void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff);
-void WKSetCookieStoragePrivateBrowsingEnabled(BOOL enabled);
-
unsigned WKGetNSAutoreleasePoolCount(void);
void WKAdvanceDefaultButtonPulseAnimation(NSButtonCell *button);
