Fix Windows build.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Dec 2018 04:42:51 +0000 (04:42 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Dec 2018 04:42:51 +0000 (04:42 +0000)
Source/WebCore:

* platform/network/curl/CookieJarCurl.h:

Source/WebKitLegacy/win:

* WebCoreSupport/WebFrameLoaderClient.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/curl/CookieJarCurl.h
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h

index 298cb28..5f85896 100644 (file)
@@ -1,5 +1,11 @@
 2018-11-30  Alex Christensen  <achristensen@webkit.org>
 
+        Fix Windows build.
+
+        * platform/network/curl/CookieJarCurl.h:
+
+2018-11-30  Alex Christensen  <achristensen@webkit.org>
+
         Move URL from WebCore to WTF
         https://bugs.webkit.org/show_bug.cgi?id=190234
 
index 6c9d313..9f69bd4 100644 (file)
 
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
+#include <wtf/URL.h>
 #include <wtf/WallTime.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 class NetworkStorageSession;
-class URL;
 enum class IncludeSecureCookies : bool;
 struct Cookie;
 struct CookieRequestHeaderFieldProxy;
index f9c128f..9fbb43d 100644 (file)
@@ -1,5 +1,11 @@
 2018-11-30  Alex Christensen  <achristensen@webkit.org>
 
+        Fix Windows build.
+
+        * WebCoreSupport/WebFrameLoaderClient.h:
+
+2018-11-30  Alex Christensen  <achristensen@webkit.org>
+
         Move URL from WebCore to WTF
         https://bugs.webkit.org/show_bug.cgi?id=190234
 
index 0822b83..e6934ab 100644 (file)
@@ -85,11 +85,7 @@ public:
     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;