Title: [213784] trunk/Source/WebKit2
- Revision
- 213784
- Author
- [email protected]
- Date
- 2017-03-13 00:30:14 -0700 (Mon, 13 Mar 2017)
Log Message
Unreviewed GTK+ build fix. Use WTF::Function<> for the
WebPageProxy::getContentsAsMHTMLData() parameter, fixing
configurations that support enabling ENABLE(MHTML).
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::getContentsAsMHTMLData):
* UIProcess/WebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213783 => 213784)
--- trunk/Source/WebKit2/ChangeLog 2017-03-13 07:18:33 UTC (rev 213783)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-13 07:30:14 UTC (rev 213784)
@@ -1,3 +1,13 @@
+2017-03-13 Zan Dobersek <[email protected]>
+
+ Unreviewed GTK+ build fix. Use WTF::Function<> for the
+ WebPageProxy::getContentsAsMHTMLData() parameter, fixing
+ configurations that support enabling ENABLE(MHTML).
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getContentsAsMHTMLData):
+ * UIProcess/WebPageProxy.h:
+
2017-03-12 Dan Bernstein <[email protected]>
[Cocoa] Incorrect availability annotations in WKUserContentController.h
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (213783 => 213784)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-13 07:18:33 UTC (rev 213783)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-13 07:30:14 UTC (rev 213784)
@@ -2951,7 +2951,7 @@
}
#if ENABLE(MHTML)
-void WebPageProxy::getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
+void WebPageProxy::getContentsAsMHTMLData(Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
{
if (!isValid()) {
callbackFunction(nullptr, CallbackBase::Error::Unknown);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (213783 => 213784)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-13 07:18:33 UTC (rev 213783)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-13 07:30:14 UTC (rev 213784)
@@ -798,7 +798,7 @@
void isWebProcessResponsive(std::function<void (bool isWebProcessResponsive)>);
#if ENABLE(MHTML)
- void getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)>);
+ void getContentsAsMHTMLData(Function<void (API::Data*, CallbackBase::Error)>&&);
#endif
void getMainResourceDataOfFrame(WebFrameProxy*, Function<void (API::Data*, CallbackBase::Error)>&&);
void getResourceDataFromFrame(WebFrameProxy*, API::URL*, Function<void (API::Data*, CallbackBase::Error)>&&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
