Title: [215994] trunk/Source
- Revision
- 215994
- Author
- [email protected]
- Date
- 2017-04-30 13:55:30 -0700 (Sun, 30 Apr 2017)
Log Message
Fix r215991
https://bugs.webkit.org/show_bug.cgi?id=171483
Unreviewed.
Source/WebCore:
* platform/spi/cf/CFNetworkSPI.h:
Source/WebKit2:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::syncAllCookies):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215993 => 215994)
--- trunk/Source/WebCore/ChangeLog 2017-04-30 20:53:01 UTC (rev 215993)
+++ trunk/Source/WebCore/ChangeLog 2017-04-30 20:55:30 UTC (rev 215994)
@@ -1,3 +1,12 @@
+2017-04-30 Brady Eidson <[email protected]>
+
+ Fix r215991
+ https://bugs.webkit.org/show_bug.cgi?id=171483
+
+ Unreviewed.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+
2017-04-30 Dan Bernstein <[email protected]>
Tried to fix the iOS build after r215992
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (215993 => 215994)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-04-30 20:53:01 UTC (rev 215993)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-04-30 20:55:30 UTC (rev 215994)
@@ -171,8 +171,7 @@
void CFHTTPCookieStorageDeleteAllCookies(CFHTTPCookieStorageRef);
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101200)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
void _CFHTTPCookieStorageFlushCookieStores();
#else
void CFHTTPCookieStorageFlushCookieStores();
Modified: trunk/Source/WebKit2/ChangeLog (215993 => 215994)
--- trunk/Source/WebKit2/ChangeLog 2017-04-30 20:53:01 UTC (rev 215993)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-30 20:55:30 UTC (rev 215994)
@@ -1,3 +1,13 @@
+2017-04-30 Brady Eidson <[email protected]>
+
+ Fix r215991
+ https://bugs.webkit.org/show_bug.cgi?id=171483
+
+ Unreviewed.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::syncAllCookies):
+
2017-04-30 Dan Bernstein <[email protected]>
[Cocoa] Replaces uses of [get…() alloc] with alloc…Instance()
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (215993 => 215994)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-04-30 20:53:01 UTC (rev 215993)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2017-04-30 20:55:30 UTC (rev 215994)
@@ -211,8 +211,11 @@
void NetworkProcess::syncAllCookies()
{
#if !PLATFORM(IOS)
-#if (__MAC_OS_X_VERSION_MIN_REQUIRED <= 101200)
+#if (__MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_CFHTTPCookieStorageFlushCookieStores();
+#pragma clang diagnostic pop
#else
CFHTTPCookieStorageFlushCookieStores();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
