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

* platform/network/curl/CookieJarCurl.cpp:
* platform/network/curl/PublicSuffixCurl.cpp:

Source/WebKitLegacy/win:

* WebCoreSupport/WebFrameLoaderClient.h:

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

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

index 5f85896..aee07c7 100644 (file)
@@ -2,6 +2,13 @@
 
         Fix Windows build.
 
+        * platform/network/curl/CookieJarCurl.cpp:
+        * platform/network/curl/PublicSuffixCurl.cpp:
+
+2018-11-30  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Windows build.
+
         * platform/network/curl/CookieJarCurl.h:
 
 2018-11-30  Alex Christensen  <achristensen@webkit.org>
index 2ec3c95..ef606b6 100644 (file)
@@ -31,9 +31,9 @@
 #include "CookieRequestHeaderFieldProxy.h"
 #include "NetworkStorageSession.h"
 #include "NotImplemented.h"
-#include "URL.h"
 
 #include <wtf/Optional.h>
+#include <wtf/URL.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
index 5e8d5c8..5f4d1fd 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(PUBLIC_SUFFIX_LIST)
 
-#include "URL.h"
 #include <libpsl.h>
+#include <wtf/URL.h>
 
 namespace WebCore {
 
index 9fbb43d..d251cba 100644 (file)
@@ -6,6 +6,12 @@
 
 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 e6934ab..788e9b8 100644 (file)
@@ -184,15 +184,9 @@ public:
 
     bool canCachePage() const override;
 
-<<<<<<< HEAD
-    RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
-        const WTF::String& referrer) override;
-    RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const WebCore::URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
-=======
     RefPtr<WebCore::Frame> createFrame(const URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
-        const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
+        const WTF::String& referrer) override;
     RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
->>>>>>> changes
     void recreatePlugin(WebCore::Widget*) override { }
     void redirectDataToPlugin(WebCore::Widget&) override;