Title: [151742] trunk/Source/WebKit/win
Revision
151742
Author
[email protected]
Date
2013-06-19 11:05:50 -0700 (Wed, 19 Jun 2013)

Log Message

[WinCairo] Does not compile.
https://bugs.webkit.org/show_bug.cgi?id=117798

Patch by [email protected] <[email protected]> on 2013-06-19
Reviewed by Brent Fulgham.

Add USE(CFNETWORK) guards.

* WebCoreSupport/WebFrameNetworkingContext.cpp: Add USE(CFNETWORK) guard.
(WebFrameNetworkingContext::ensurePrivateBrowsingSession): Change USE(CF_NETWORK) to USE(CFNETWORK).
* WebCoreSupport/WebFrameNetworkingContext.h: Add USE(CFNETWORK) guard.

Modified Paths

Diff

Modified: trunk/Source/WebKit/win/ChangeLog (151741 => 151742)


--- trunk/Source/WebKit/win/ChangeLog	2013-06-19 17:42:44 UTC (rev 151741)
+++ trunk/Source/WebKit/win/ChangeLog	2013-06-19 18:05:50 UTC (rev 151742)
@@ -1,3 +1,16 @@
+2013-06-19  [email protected]  <[email protected]>
+
+        [WinCairo] Does not compile.
+        https://bugs.webkit.org/show_bug.cgi?id=117798
+
+        Reviewed by Brent Fulgham.
+
+        Add USE(CFNETWORK) guards.
+
+        * WebCoreSupport/WebFrameNetworkingContext.cpp: Add USE(CFNETWORK) guard.
+        (WebFrameNetworkingContext::ensurePrivateBrowsingSession): Change USE(CF_NETWORK) to USE(CFNETWORK).
+        * WebCoreSupport/WebFrameNetworkingContext.h: Add USE(CFNETWORK) guard.
+
 2013-06-18  Roger Fong  <[email protected]>
 
         Unreviewed. Build fix for Apple Windows.

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp (151741 => 151742)


--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp	2013-06-19 17:42:44 UTC (rev 151741)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp	2013-06-19 18:05:50 UTC (rev 151742)
@@ -35,7 +35,9 @@
 #include <WebCore/Page.h>
 #include <WebCore/ResourceError.h>
 #include <WebCore/Settings.h>
+#if USE(CFNETWORK)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
 
 using namespace WebCore;
 
@@ -64,7 +66,7 @@
 
 void WebFrameNetworkingContext::ensurePrivateBrowsingSession()
 {
-#if USE(CF_NETWORK)
+#if USE(CFNETWORK)
     ASSERT(isMainThread());
 
     if (privateSession)
@@ -98,6 +100,7 @@
     return frame()->loader()->referrer();
 }
 
+#if USE(CFNETWORK)
 NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
 {
     ASSERT(isMainThread());
@@ -107,3 +110,4 @@
 
     return NetworkStorageSession::defaultStorageSession();
 }
+#endif

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h (151741 => 151742)


--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h	2013-06-19 17:42:44 UTC (rev 151741)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h	2013-06-19 18:05:50 UTC (rev 151742)
@@ -48,7 +48,9 @@
     }
 
     virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
+#if USE(CFNETWORK)
     virtual WebCore::NetworkStorageSession& storageSession() const OVERRIDE;
+#endif
     virtual String referrer() const OVERRIDE;
     virtual String userAgent() const { return m_userAgent; }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to