<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170048] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170048">170048</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-17 00:42:32 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed build fix for the GTK+ port. Removing the *Callback::create() wrappings
for lambda callbacks that aren't required anymore after the changes in <a href="http://trac.webkit.org/projects/webkit/changeset/170041">r170041</a>.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_can_execute_editing_command):
(webkit_web_view_run_javascript):
(resourcesStreamReadCallback):
(webkit_web_view_save):
(webkit_web_view_save_to_file):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170047 => 170048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-17 05:45:40 UTC (rev 170047)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-17 07:42:32 UTC (rev 170048)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-17 Zan Dobersek <zdobersek@igalia.com>
+
+ Unreviewed build fix for the GTK+ port. Removing the *Callback::create() wrappings
+ for lambda callbacks that aren't required anymore after the changes in r170041.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_can_execute_editing_command):
+ (webkit_web_view_run_javascript):
+ (resourcesStreamReadCallback):
+ (webkit_web_view_save):
+ (webkit_web_view_save_to_file):
+
</ins><span class="cx"> 2014-06-16 Jaehun Lim <ljaehun.lim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix when MHTML is enabled after r170041
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (170047 => 170048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-06-17 05:45:40 UTC (rev 170047)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-06-17 07:42:32 UTC (rev 170048)
</span><span class="lines">@@ -2513,9 +2513,9 @@
</span><span class="cx"> g_return_if_fail(command);
</span><span class="cx">
</span><span class="cx"> GTask* task = g_task_new(webView, cancellable, callback, userData);
</span><del>- getPage(webView)->validateCommand(String::fromUTF8(command), ValidateCommandCallback::create([task](const String&, bool isEnabled, int32_t, CallbackBase::Error) {
</del><ins>+ getPage(webView)->validateCommand(String::fromUTF8(command), [task](const String&, bool isEnabled, int32_t, CallbackBase::Error) {
</ins><span class="cx"> g_task_return_boolean(adoptGRef(task).get(), isEnabled);
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2628,9 +2628,9 @@
</span><span class="cx"> g_return_if_fail(script);
</span><span class="cx">
</span><span class="cx"> GTask* task = g_task_new(webView, cancellable, callback, userData);
</span><del>- getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), ScriptValueCallback::create([task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
</del><ins>+ getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
</ins><span class="cx"> webkitWebViewRunJavaScriptCallback(serializedScriptValue, adoptGRef(task).get());
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2719,9 +2719,9 @@
</span><span class="cx"> WebKitWebView* webView = WEBKIT_WEB_VIEW(g_task_get_source_object(task.get()));
</span><span class="cx"> gpointer outputStreamData = g_memory_output_stream_get_data(G_MEMORY_OUTPUT_STREAM(object));
</span><span class="cx"> getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(reinterpret_cast<const gchar*>(outputStreamData)),
</span><del>- ScriptValueCallback::create([task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
- webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
- }));
</del><ins>+ [task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
+ webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2897,9 +2897,9 @@
</span><span class="cx"> GTask* task = g_task_new(webView, cancellable, callback, userData);
</span><span class="cx"> g_task_set_source_tag(task, reinterpret_cast<gpointer>(webkit_web_view_save));
</span><span class="cx"> g_task_set_task_data(task, createViewSaveAsyncData(), reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
</span><del>- getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
</del><ins>+ getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, CallbackBase::Error) {
</ins><span class="cx"> getContentsAsMHTMLDataCallback(data, task);
</span><del>- }), false);
</del><ins>+ }, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2962,9 +2962,9 @@
</span><span class="cx"> data->file = file;
</span><span class="cx"> g_task_set_task_data(task, data, reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
</span><span class="cx">
</span><del>- getPage(webView)->getContentsAsMHTMLData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
</del><ins>+ getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, CallbackBase::Error) {
</ins><span class="cx"> getContentsAsMHTMLDataCallback(data, task);
</span><del>- }), false);
</del><ins>+ }, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>