Diff
Modified: trunk/Source/WebKit2/ChangeLog (191407 => 191408)
--- trunk/Source/WebKit2/ChangeLog 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-21 22:30:01 UTC (rev 191408)
@@ -1,5 +1,30 @@
2015-10-21 Anders Carlsson <[email protected]>
+ Get rid of useBinaryEncoding from WKPageGetContentsAsMHTMLData
+ https://bugs.webkit.org/show_bug.cgi?id=150417
+
+ Reviewed by Tim Horton.
+
+ The useBinaryEncoding parameter is always false, so just get rid of it.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetContentsAsMHTMLData):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/efl/ewk_view.cpp:
+ (ewk_view_page_contents_get):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_save):
+ (webkit_web_view_save_to_file):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getContentsAsMHTMLData):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::getContentsAsMHTMLData):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
+2015-10-21 Anders Carlsson <[email protected]>
+
WebContextMenuProxyMac::setupServicesMenu doesn't need to take a context parameter
https://bugs.webkit.org/show_bug.cgi?id=150418
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191407 => 191408)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-21 22:30:01 UTC (rev 191408)
@@ -2185,13 +2185,12 @@
toImpl(pageRef)->getSelectionAsWebArchiveData(toGenericCallbackFunction(context, callback));
}
-void WKPageGetContentsAsMHTMLData(WKPageRef pageRef, bool useBinaryEncoding, void* context, WKPageGetContentsAsMHTMLDataFunction callback)
+void WKPageGetContentsAsMHTMLData(WKPageRef pageRef, void* context, WKPageGetContentsAsMHTMLDataFunction callback)
{
#if ENABLE(MHTML)
- toImpl(pageRef)->getContentsAsMHTMLData(toGenericCallbackFunction(context, callback), useBinaryEncoding);
+ toImpl(pageRef)->getContentsAsMHTMLData(toGenericCallbackFunction(context, callback));
#else
UNUSED_PARAM(pageRef);
- UNUSED_PARAM(useBinaryEncoding);
UNUSED_PARAM(context);
UNUSED_PARAM(callback);
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (191407 => 191408)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2015-10-21 22:30:01 UTC (rev 191408)
@@ -244,7 +244,7 @@
WK_EXPORT void WKPageGetContentsAsString(WKPageRef page, void* context, WKPageGetContentsAsStringFunction function);
typedef void (*WKPageGetContentsAsMHTMLDataFunction)(WKDataRef, WKErrorRef, void*);
-WK_EXPORT void WKPageGetContentsAsMHTMLData(WKPageRef page, bool useBinaryEncoding, void* context, WKPageGetContentsAsMHTMLDataFunction function);
+WK_EXPORT void WKPageGetContentsAsMHTMLData(WKPageRef page, void* context, WKPageGetContentsAsMHTMLDataFunction function);
typedef void (*WKPageGetSelectionAsWebArchiveDataFunction)(WKDataRef, WKErrorRef, void*);
WK_EXPORT void WKPageGetSelectionAsWebArchiveData(WKPageRef page, void* context, WKPageGetSelectionAsWebArchiveDataFunction function);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (191407 => 191408)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2015-10-21 22:30:01 UTC (rev 191408)
@@ -644,7 +644,7 @@
switch (context->type) {
case EWK_PAGE_CONTENTS_TYPE_MHTML:
- WKPageGetContentsAsMHTMLData(impl->wkPage(), false, context, ewkViewPageContentsAsMHTMLCallback);
+ WKPageGetContentsAsMHTMLData(impl->wkPage(), context, ewkViewPageContentsAsMHTMLCallback);
break;
case EWK_PAGE_CONTENTS_TYPE_STRING:
WKPageGetContentsAsString(impl->wkPage(), context, ewkViewPageContentsAsStringCallback);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (191407 => 191408)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-10-21 22:30:01 UTC (rev 191408)
@@ -3328,7 +3328,7 @@
g_task_set_task_data(task, createViewSaveAsyncData(), reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, WebKit::CallbackBase::Error) {
getContentsAsMHTMLDataCallback(data, task);
- }, false);
+ });
}
/**
@@ -3393,7 +3393,7 @@
getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, WebKit::CallbackBase::Error) {
getContentsAsMHTMLDataCallback(data, task);
- }, false);
+ });
}
/**
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191407 => 191408)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-21 22:30:01 UTC (rev 191408)
@@ -2639,7 +2639,7 @@
}
#if ENABLE(MHTML)
-void WebPageProxy::getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction, bool useBinaryEncoding)
+void WebPageProxy::getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
{
if (!isValid()) {
callbackFunction(nullptr, CallbackBase::Error::Unknown);
@@ -2647,7 +2647,7 @@
}
uint64_t callbackID = m_callbacks.put(WTF::move(callbackFunction), m_process->throttler().backgroundActivityToken());
- m_process->send(Messages::WebPage::GetContentsAsMHTMLData(callbackID, useBinaryEncoding), m_pageID);
+ m_process->send(Messages::WebPage::GetContentsAsMHTMLData(callbackID), m_pageID);
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191407 => 191408)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-21 22:30:01 UTC (rev 191408)
@@ -752,7 +752,7 @@
void getBytecodeProfile(std::function<void (const String&, CallbackBase::Error)>);
#if ENABLE(MHTML)
- void getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)>, bool useBinaryEncoding);
+ void getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)>);
#endif
void getMainResourceDataOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
void getResourceDataFromFrame(WebFrameProxy*, API::URL*, std::function<void (API::Data*, CallbackBase::Error)>);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (191407 => 191408)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-21 22:30:01 UTC (rev 191408)
@@ -2524,11 +2524,9 @@
}
#if ENABLE(MHTML)
-void WebPage::getContentsAsMHTMLData(uint64_t callbackID, bool useBinaryEncoding)
+void WebPage::getContentsAsMHTMLData(uint64_t callbackID)
{
- RefPtr<SharedBuffer> buffer = useBinaryEncoding
- ? MHTMLArchive::generateMHTMLDataUsingBinaryEncoding(m_page.get())
- : MHTMLArchive::generateMHTMLData(m_page.get());
+ RefPtr<SharedBuffer> buffer = MHTMLArchive::generateMHTMLData(m_page.get());
// FIXME: Use SharedBufferDataReference.
IPC::DataReference dataReference;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (191407 => 191408)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-10-21 22:30:01 UTC (rev 191408)
@@ -1038,7 +1038,7 @@
void getContentsAsString(uint64_t callbackID);
#if ENABLE(MHTML)
- void getContentsAsMHTMLData(uint64_t callbackID, bool useBinaryEncoding);
+ void getContentsAsMHTMLData(uint64_t callbackID);
#endif
void getMainResourceDataOfFrame(uint64_t frameID, uint64_t callbackID);
void getResourceDataFromFrame(uint64_t frameID, const String& resourceURL, uint64_t callbackID);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (191407 => 191408)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-10-21 22:17:03 UTC (rev 191407)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-10-21 22:30:01 UTC (rev 191408)
@@ -149,7 +149,7 @@
# Callbacks.
GetContentsAsString(uint64_t callbackID)
#if ENABLE(MHTML)
- GetContentsAsMHTMLData(uint64_t callbackID, bool useBinaryEncoding)
+ GetContentsAsMHTMLData(uint64_t callbackID)
#endif
GetMainResourceDataOfFrame(uint64_t frameID, uint64_t callbackID)
GetResourceDataFromFrame(uint64_t frameID, String resourceURL, uint64_t callbackID)
