Modified: trunk/Source/WebCore/ChangeLog (238773 => 238774)
--- trunk/Source/WebCore/ChangeLog 2018-12-01 04:42:51 UTC (rev 238773)
+++ trunk/Source/WebCore/ChangeLog 2018-12-01 04:49:56 UTC (rev 238774)
@@ -2,6 +2,13 @@
Fix Windows build.
+ * platform/network/curl/CookieJarCurl.cpp:
+ * platform/network/curl/PublicSuffixCurl.cpp:
+
+2018-11-30 Alex Christensen <achristen...@webkit.org>
+
+ Fix Windows build.
+
* platform/network/curl/CookieJarCurl.h:
2018-11-30 Alex Christensen <achristen...@webkit.org>
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp (238773 => 238774)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2018-12-01 04:42:51 UTC (rev 238773)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2018-12-01 04:49:56 UTC (rev 238774)
@@ -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>
Modified: trunk/Source/WebCore/platform/network/curl/PublicSuffixCurl.cpp (238773 => 238774)
--- trunk/Source/WebCore/platform/network/curl/PublicSuffixCurl.cpp 2018-12-01 04:42:51 UTC (rev 238773)
+++ trunk/Source/WebCore/platform/network/curl/PublicSuffixCurl.cpp 2018-12-01 04:49:56 UTC (rev 238774)
@@ -28,8 +28,8 @@
#if ENABLE(PUBLIC_SUFFIX_LIST)
-#include "URL.h"
#include <libpsl.h>
+#include <wtf/URL.h>
namespace WebCore {
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (238773 => 238774)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-12-01 04:42:51 UTC (rev 238773)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-12-01 04:49:56 UTC (rev 238774)
@@ -6,6 +6,12 @@
2018-11-30 Alex Christensen <achristen...@webkit.org>
+ Fix Windows build.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
+2018-11-30 Alex Christensen <achristen...@webkit.org>
+
Move URL from WebCore to WTF
https://bugs.webkit.org/show_bug.cgi?id=190234
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h (238773 => 238774)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-12-01 04:42:51 UTC (rev 238773)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h 2018-12-01 04:49:56 UTC (rev 238774)
@@ -184,15 +184,9 @@
bool canCachePage() const override;
-<<<<<<< HEAD
- RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
+ RefPtr<WebCore::Frame> createFrame(const 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;
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;
