Title: [210863] trunk/Source/WebKit/win
- Revision
- 210863
- Author
- achristen...@apple.com
- Date
- 2017-01-18 12:28:02 -0800 (Wed, 18 Jan 2017)
Log Message
Fix WinCairo build after r210845.
https://bugs.webkit.org/show_bug.cgi?id=167055
* WebCoreSupport/WebFrameLoaderClient.cpp:
* WebCoreSupport/WebFrameLoaderClient.h:
shouldCacheResponse isn't used when loading with libcurl.
It was dead code before Darin added "override".
WebCore/FrameLoaderClient.h has this inside of USE(CFURLCONNECTION) macros, now we have them here, too.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (210862 => 210863)
--- trunk/Source/WebKit/win/ChangeLog 2017-01-18 20:06:46 UTC (rev 210862)
+++ trunk/Source/WebKit/win/ChangeLog 2017-01-18 20:28:02 UTC (rev 210863)
@@ -1,3 +1,14 @@
+2017-01-18 Alex Christensen <achristen...@webkit.org>
+
+ Fix WinCairo build after r210845.
+ https://bugs.webkit.org/show_bug.cgi?id=167055
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ shouldCacheResponse isn't used when loading with libcurl.
+ It was dead code before Darin added "override".
+ WebCore/FrameLoaderClient.h has this inside of USE(CFURLCONNECTION) macros, now we have them here, too.
+
2017-01-18 Andreas Kling <akl...@apple.com>
Document::securityOrigin() should return a reference.
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (210862 => 210863)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2017-01-18 20:06:46 UTC (rev 210862)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2017-01-18 20:28:02 UTC (rev 210863)
@@ -293,6 +293,7 @@
resourceLoadDelegate->didFailLoadingWithError(webView, identifier, webError.get(), getWebDataSource(loader));
}
+#if USE(CFURLCONNECTION)
bool WebFrameLoaderClient::shouldCacheResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& response, const unsigned char* data, const unsigned long long length)
{
WebView* webView = m_webFrame->webView();
@@ -311,6 +312,7 @@
return true;
}
+#endif
void WebFrameLoaderClient::dispatchDidDispatchOnloadEvents()
{
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (210862 => 210863)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 20:06:46 UTC (rev 210862)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2017-01-18 20:28:02 UTC (rev 210863)
@@ -74,7 +74,9 @@
void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) override;
void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) override;
void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&) override;
+#if USE(CFURLCONNECTION)
bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) override;
+#endif
void dispatchDidDispatchOnloadEvents() override;
void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
