Title: [238773] trunk/Source
- Revision
- 238773
- Author
- [email protected]
- Date
- 2018-11-30 20:42:51 -0800 (Fri, 30 Nov 2018)
Log Message
Fix Windows build.
Source/WebCore:
* platform/network/curl/CookieJarCurl.h:
Source/WebKitLegacy/win:
* WebCoreSupport/WebFrameLoaderClient.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (238772 => 238773)
--- trunk/Source/WebCore/ChangeLog 2018-12-01 04:28:18 UTC (rev 238772)
+++ trunk/Source/WebCore/ChangeLog 2018-12-01 04:42:51 UTC (rev 238773)
@@ -1,5 +1,11 @@
2018-11-30 Alex Christensen <[email protected]>
+ Fix Windows build.
+
+ * platform/network/curl/CookieJarCurl.h:
+
+2018-11-30 Alex Christensen <[email protected]>
+
Move URL from WebCore to WTF
https://bugs.webkit.org/show_bug.cgi?id=190234
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h (238772 => 238773)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h 2018-12-01 04:28:18 UTC (rev 238772)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h 2018-12-01 04:42:51 UTC (rev 238773)
@@ -26,6 +26,7 @@
#include <wtf/Forward.h>
#include <wtf/HashSet.h>
+#include <wtf/URL.h>
#include <wtf/WallTime.h>
#include <wtf/text/WTFString.h>
@@ -32,7 +33,6 @@
namespace WebCore {
class NetworkStorageSession;
-class URL;
enum class IncludeSecureCookies : bool;
struct Cookie;
struct CookieRequestHeaderFieldProxy;
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (238772 => 238773)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-12-01 04:28:18 UTC (rev 238772)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-12-01 04:42:51 UTC (rev 238773)
@@ -1,5 +1,11 @@
2018-11-30 Alex Christensen <[email protected]>
+ Fix Windows build.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
+2018-11-30 Alex Christensen <[email protected]>
+
Move URL from WebCore to WTF
https://bugs.webkit.org/show_bug.cgi?id=190234
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h (238772 => 238773)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-12-01 04:28:18 UTC (rev 238772)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-12-01 04:42:51 UTC (rev 238773)
@@ -85,11 +85,7 @@
void dispatchDidDispatchOnloadEvents() override;
void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
void dispatchDidCancelClientRedirect() override;
-<<<<<<< HEAD
- void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate, WebCore::LockBackForwardList) override;
-=======
- void dispatchWillPerformClientRedirect(const URL&, double interval, WallTime fireDate) override;
->>>>>>> changes
+ void dispatchWillPerformClientRedirect(const URL&, double interval, WallTime fireDate, WebCore::LockBackForwardList) override;
void dispatchDidChangeLocationWithinPage() override;
void dispatchDidPushStateWithinPage() override;
void dispatchDidReplaceStateWithinPage() override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
