Diff
Modified: trunk/Source/WebKit/win/ChangeLog (135009 => 135010)
--- trunk/Source/WebKit/win/ChangeLog 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit/win/ChangeLog 2012-11-16 23:31:03 UTC (rev 135010)
@@ -1,3 +1,18 @@
+2012-11-16 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Unreviewed build fix after r134960.
+
+ Avoid including Mac-specific headers.
+
+ * WebCoreSupport/WebFrameNetworkingContext.cpp: Stub out
+ CFNetwork-based implementations.
+ * WebCoreSupport/WebFrameNetworkingContext.h: Exclude
+ CFNetwork data types.
+ * WebCoreSupport/WebPlatformStrategies.cpp: Stub out
+ CFNetwork-based implementations.
+ * WebCoreSupport/WebPlatformStrategies.h: Exclude
+ CFNetwork data types.
+
2012-11-15 Alexey Proskuryakov <a...@apple.com>
Private Browsing is a per-page setting that sets a global value
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp (135009 => 135010)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2012-11-16 23:31:03 UTC (rev 135010)
@@ -21,15 +21,21 @@
#include "WebFrameNetworkingContext.h"
#include "FrameLoaderClient.h"
+#if USE(CFNETWORK)
#include <CFNetwork/CFHTTPCookiesPriv.h>
#include <WebCore/CookieStorageCFNet.h>
+#endif
#include <WebCore/Settings.h>
+#if USE(CFNETWORK)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
using namespace WebCore;
+#if USE(CFNETWORK)
static CFURLStorageSessionRef defaultCFStorageSession;
static CFURLStorageSessionRef privateBrowsingStorageSession;
+#endif
PassRefPtr<WebFrameNetworkingContext> WebFrameNetworkingContext::create(Frame* frame, const String& userAgent)
{
@@ -65,13 +71,16 @@
void WebFrameNetworkingContext::switchToNewTestingSession()
{
+#if USE(CFNETWORK)
// Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
defaultCFStorageSession = wkCreatePrivateStorageSession(CFSTR("Private WebKit Session"), defaultCFStorageSession);
+#endif
}
void WebFrameNetworkingContext::ensurePrivateBrowsingSession()
{
ASSERT(isMainThread());
+#if USE(CFNETWORK)
if (privateBrowsingStorageSession)
return;
@@ -79,17 +88,21 @@
RetainPtr<CFStringRef> cfIdentifier = String(base + ".PrivateBrowsing").createCFString();
privateBrowsingStorageSession = wkCreatePrivateStorageSession(cfIdentifier.get(), defaultCFStorageSession);
+#endif
}
void WebFrameNetworkingContext::destroyPrivateBrowsingSession()
{
+#if USE(CFNETWORK)
if (!privateBrowsingStorageSession)
return;
CFRelease(privateBrowsingStorageSession);
privateBrowsingStorageSession = 0;
+#endif
}
+#if USE(CFNETWORK)
CFURLStorageSessionRef WebFrameNetworkingContext::defaultStorageSession()
{
return defaultCFStorageSession;
@@ -122,3 +135,4 @@
CFHTTPCookieStorageSetCookieAcceptPolicy(privateBrowsingCookieStorage.get(), policy);
}
}
+#endif
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h (135009 => 135010)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2012-11-16 23:31:03 UTC (rev 135010)
@@ -32,10 +32,13 @@
static void switchToNewTestingSession();
static void ensurePrivateBrowsingSession();
static void destroyPrivateBrowsingSession();
+
+#if USE(CFNETWORK)
static CFURLStorageSessionRef defaultStorageSession();
static void setCookieAcceptPolicyForTestingContext(CFHTTPCookieStorageAcceptPolicy);
static void setCookieAcceptPolicyForAllContexts(CFHTTPCookieStorageAcceptPolicy);
+#endif
private:
WebFrameNetworkingContext(WebCore::Frame* frame, const WTF::String& userAgent)
@@ -46,7 +49,9 @@
virtual WTF::String userAgent() const;
virtual WTF::String referrer() const;
+#if USE(CFNETWORK)
virtual CFURLStorageSessionRef storageSession() const;
+#endif
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
WTF::String m_userAgent;
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (135009 => 135010)
--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2012-11-16 23:31:03 UTC (rev 135010)
@@ -30,7 +30,9 @@
#include <WebCore/Page.h>
#include <WebCore/PageGroup.h>
#include <WebCore/PluginDatabase.h>
+#if USE(CFNETWORK)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
using namespace WebCore;
@@ -78,6 +80,7 @@
{
}
+#if USE(CFNETWORK)
RetainPtr<CFHTTPCookieStorageRef> WebPlatformStrategies::defaultCookieStorage()
{
if (CFURLStorageSessionRef session = WebFrameNetworkingContext::defaultStorageSession())
@@ -85,6 +88,7 @@
return wkGetDefaultHTTPCookieStorage();
}
+#endif
void WebPlatformStrategies::refreshPlugins()
{
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h (135009 => 135010)
--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2012-11-16 23:31:03 UTC (rev 135010)
@@ -50,7 +50,9 @@
// WebCore::CookiesStrategy
virtual void notifyCookiesChanged();
+#if USE(CFNETWORK)
virtual RetainPtr<CFHTTPCookieStorageRef> defaultCookieStorage();
+#endif
// WebCore::PluginStrategy
virtual void refreshPlugins();
Modified: trunk/Source/WebKit2/ChangeLog (135009 => 135010)
--- trunk/Source/WebKit2/ChangeLog 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-16 23:31:03 UTC (rev 135010)
@@ -1,3 +1,10 @@
+2012-11-16 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Build correction after r134960.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Stub out
+ calls to CFNetwork-based implementation.
+
2012-11-16 Martin Robinson <mrobin...@igalia.com>
Move authentication dialog to the UIProcess
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (135009 => 135010)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-11-16 23:30:31 UTC (rev 135009)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-11-16 23:31:03 UTC (rev 135010)
@@ -42,7 +42,7 @@
#include <WebCore/PlatformPasteboard.h>
#include <wtf/Atomics.h>
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(CFNETWORK)
#include "WebFrameNetworkingContext.h"
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
@@ -106,7 +106,7 @@
WebCookieManager::shared().dispatchCookiesDidChange();
}
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(CFNETWORK)
RetainPtr<CFHTTPCookieStorageRef> WebPlatformStrategies::defaultCookieStorage()
{
if (CFURLStorageSessionRef session = WebFrameNetworkingContext::defaultStorageSession())
