<!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>[187220] trunk</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/187220">187220</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-23 01:23:25 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add API to allow executing editing commands that require an argument
https://bugs.webkit.org/show_bug.cgi?id=146781
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
Commands like InsertImage or CreateLink receive an argument, but
we only have webkit_web_view_execute_editing_command() that
doesn't receive any argument. This patch adds
webkit_web_view_execute_editing_command_with_argument() for those
commands. It also adds WEBKIT_EDITING_COMMAND_INSERT_IMAGE and
WEBKIT_EDITING_COMMAND_CREATE_LINK to the predefined editing commands.
* UIProcess/API/gtk/WebKitEditingCommands.h: Add
WEBKIT_EDITING_COMMAND_INSERT_IMAGE and WEBKIT_EDITING_COMMAND_CREATE_LINK.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_execute_editing_command_with_argument):
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt: Add new symbols.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::executeEditCommand): Pass also the argument
to the message.
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::executeEditCommand): Add the argument parameter
to the message handler.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in: Add argument parameter
to ExecuteEditCommand message.
Tools:
Add buttons to insert image/link to the MiniBrowser edit toolbar,
and test cases for insert image/link commands too.
* MiniBrowser/gtk/BrowserWindow.c:
(insertImageCommandCallback):
(insertLinkCommandCallback):
(browserWindowSetupEditorToolbar):
(browserWindowConstructed):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
(testWebViewEditorInsertImage):
(testWebViewEditorCreateLink):
(beforeAll):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitEditingCommandsh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditingCommands.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtk40sectionstxt">trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkBrowserWindowc">trunk/Tools/MiniBrowser/gtk/BrowserWindow.c</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-07-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add API to allow executing editing commands that require an argument
+ https://bugs.webkit.org/show_bug.cgi?id=146781
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Commands like InsertImage or CreateLink receive an argument, but
+ we only have webkit_web_view_execute_editing_command() that
+ doesn't receive any argument. This patch adds
+ webkit_web_view_execute_editing_command_with_argument() for those
+ commands. It also adds WEBKIT_EDITING_COMMAND_INSERT_IMAGE and
+ WEBKIT_EDITING_COMMAND_CREATE_LINK to the predefined editing commands.
+
+ * UIProcess/API/gtk/WebKitEditingCommands.h: Add
+ WEBKIT_EDITING_COMMAND_INSERT_IMAGE and WEBKIT_EDITING_COMMAND_CREATE_LINK.
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_execute_editing_command_with_argument):
+ * UIProcess/API/gtk/WebKitWebView.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt: Add new symbols.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::executeEditCommand): Pass also the argument
+ to the message.
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::executeEditCommand): Add the argument parameter
+ to the message handler.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in: Add argument parameter
+ to ExecuteEditCommand message.
+
</ins><span class="cx"> 2015-07-22 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add ENABLE_WEBASSEMBLY feature flag for WebAssembly
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitEditingCommandsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditingCommands.h (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditingCommands.h 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditingCommands.h 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -94,6 +94,31 @@
</span><span class="cx"> */
</span><span class="cx"> #define WEBKIT_EDITING_COMMAND_REDO "Redo"
</span><span class="cx">
</span><ins>+/**
+ * WEBKIT_EDITING_COMMAND_INSERT_IMAGE:
+ *
+ * The insert image command. Creates an image element that is inserted at
+ * the current cursor position. It receives an URI as argument,
+ * that is used as the image source. This command should be executed with
+ * webkit_web_view_execute_editing_command_with_argument().
+ *
+ * Since: 2.10
+ */
+#define WEBKIT_EDITING_COMMAND_INSERT_IMAGE "InsertImage"
+
+/**
+ * WEBKIT_EDITING_COMMAND_CREATE_LINK:
+ *
+ * The create link command. Creates a link elment thst is inserted at
+ * the current cursor position. If there's a selection, the selected text
+ * will be used as the link text, otherwise the URL itself will be used.
+ * It receives the link URL as argument. This command should be executed
+ * with webkit_web_view_execute_editing_command_with_argument()
+ *
+ * Since: 2.10
+ */
+#define WEBKIT_EDITING_COMMAND_CREATE_LINK "CreateLink"
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -2945,6 +2945,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * webkit_web_view_execute_editing_command_with_argument:
+ * @web_view: a #WebKitWebView
+ * @command: the command to execute
+ * @argument: the command argument
+ *
+ * Request to execute the given @command with @argument for @web_view. You can use
+ * webkit_web_view_can_execute_editing_command() to check whether
+ * it's possible to execute the command.
+ *
+ * Since: 2.10
+ */
+void webkit_web_view_execute_editing_command_with_argument(WebKitWebView* webView, const char* command, const char* argument)
+{
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+ g_return_if_fail(command);
+ g_return_if_fail(argument);
+
+ getPage(webView)->executeEditCommand(String::fromUTF8(command), String::fromUTF8(argument));
+}
+
+/**
</ins><span class="cx"> * webkit_web_view_get_find_controller:
</span><span class="cx"> * @web_view: the #WebKitWebView
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -391,6 +391,11 @@
</span><span class="cx"> webkit_web_view_execute_editing_command (WebKitWebView *web_view,
</span><span class="cx"> const gchar *command);
</span><span class="cx">
</span><ins>+WEBKIT_API void
+webkit_web_view_execute_editing_command_with_argument(WebKitWebView *web_view,
+ const char *command,
+ const char *argument);
+
</ins><span class="cx"> WEBKIT_API WebKitFindController *
</span><span class="cx"> webkit_web_view_get_find_controller (WebKitWebView *web_view);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtk40sectionstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -144,6 +144,8 @@
</span><span class="cx"> WEBKIT_EDITING_COMMAND_SELECT_ALL
</span><span class="cx"> WEBKIT_EDITING_COMMAND_UNDO
</span><span class="cx"> WEBKIT_EDITING_COMMAND_REDO
</span><ins>+WEBKIT_EDITING_COMMAND_INSERT_IMAGE
+WEBKIT_EDITING_COMMAND_CREATE_LINK
</ins><span class="cx">
</span><span class="cx"> <SUBSECTION>
</span><span class="cx"> webkit_web_view_new
</span><span class="lines">@@ -185,6 +187,7 @@
</span><span class="cx"> webkit_web_view_can_execute_editing_command
</span><span class="cx"> webkit_web_view_can_execute_editing_command_finish
</span><span class="cx"> webkit_web_view_execute_editing_command
</span><ins>+webkit_web_view_execute_editing_command_with_argument
</ins><span class="cx"> webkit_web_view_get_find_controller
</span><span class="cx"> webkit_web_view_get_inspector
</span><span class="cx"> webkit_web_view_get_javascript_global_context
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx"> m_maintainsInactiveSelection = newValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::executeEditCommand(const String& commandName)
</del><ins>+void WebPageProxy::executeEditCommand(const String& commandName, const String& argument)
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<String> ignoreSpellingCommandName(ASCIILiteral("ignoreSpelling"));
</span><span class="cx">
</span><span class="lines">@@ -1557,7 +1557,7 @@
</span><span class="cx"> if (commandName == ignoreSpellingCommandName)
</span><span class="cx"> ++m_pendingLearnOrIgnoreWordMessageCount;
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::ExecuteEditCommand(commandName), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::ExecuteEditCommand(commandName, argument), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setEditable(bool editable)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx">
</span><span class="cx"> void addMIMETypeWithCustomContentProvider(const String& mimeType);
</span><span class="cx">
</span><del>- void executeEditCommand(const String& commandName);
</del><ins>+ void executeEditCommand(const String& commandName, const String& argument = String());
</ins><span class="cx"> void validateCommand(const String& commandName, std::function<void (const String&, bool, int32_t, CallbackBase::Error)>);
</span><span class="cx">
</span><span class="cx"> const EditorState& editorState() const { return m_editorState; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -2147,9 +2147,9 @@
</span><span class="cx"> send(Messages::WebPageProxy::ValidateCommandCallback(commandName, isEnabled, state, callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::executeEditCommand(const String& commandName)
</del><ins>+void WebPage::executeEditCommand(const String& commandName, const String& argument)
</ins><span class="cx"> {
</span><del>- executeEditingCommand(commandName, String());
</del><ins>+ executeEditingCommand(commandName, argument);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::restoreSession(const Vector<BackForwardListItemState>& itemStates)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> void updateIsInWindow(bool isInitialState = false);
</span><span class="cx"> void setViewState(WebCore::ViewState::Flags, bool wantsDidUpdateViewState, const Vector<uint64_t>& callbackIDs);
</span><span class="cx"> void validateCommand(const String&, uint64_t);
</span><del>- void executeEditCommand(const String&);
</del><ins>+ void executeEditCommand(const String&, const String&);
</ins><span class="cx"> void setEditable(bool);
</span><span class="cx">
</span><span class="cx"> void updateUserActivity();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> SetEditable(bool editable)
</span><span class="cx"> ValidateCommand(String name, uint64_t callbackID)
</span><del>- ExecuteEditCommand(String name)
</del><ins>+ ExecuteEditCommand(String name, String argument)
</ins><span class="cx">
</span><span class="cx"> DidRemoveEditCommand(uint64_t commandID)
</span><span class="cx"> ReapplyEditCommand(uint64_t commandID)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -1996,7 +1996,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::executeEditCommandWithCallback(const String& commandName, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- executeEditCommand(commandName);
</del><ins>+ executeEditCommand(commandName, String());
</ins><span class="cx"> if (commandName == "toggleBold" || commandName == "toggleItalic" || commandName == "toggleUnderline")
</span><span class="cx"> send(Messages::WebPageProxy::EditorStateChanged(editorState()));
</span><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Tools/ChangeLog 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-07-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Add API to allow executing editing commands that require an argument
+ https://bugs.webkit.org/show_bug.cgi?id=146781
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add buttons to insert image/link to the MiniBrowser edit toolbar,
+ and test cases for insert image/link commands too.
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (insertImageCommandCallback):
+ (insertLinkCommandCallback):
+ (browserWindowSetupEditorToolbar):
+ (browserWindowConstructed):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
+ (testWebViewEditorInsertImage):
+ (testWebViewEditorCreateLink):
+ (beforeAll):
+
+2015-07-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unregistering and re-registering a user message handler does not work
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138142
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkBrowserWindowc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -700,6 +700,46 @@
</span><span class="cx"> webkit_web_view_execute_editing_command(window->webView, gtk_widget_get_name(widget));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void insertImageCommandCallback(GtkWidget*widget, BrowserWindow *window)
+{
+ GtkWidget *fileChooser = gtk_file_chooser_dialog_new("Insert Image", GTK_WINDOW(window), GTK_FILE_CHOOSER_ACTION_OPEN,
+ "Cancel", GTK_RESPONSE_CANCEL, "Open", GTK_RESPONSE_ACCEPT, NULL);
+
+ GtkFileFilter *filter = gtk_file_filter_new();
+ gtk_file_filter_set_name(filter, "Images");
+ gtk_file_filter_add_pixbuf_formats(filter);
+ gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(fileChooser), filter);
+
+ if (gtk_dialog_run(GTK_DIALOG(fileChooser)) == GTK_RESPONSE_ACCEPT) {
+ char *uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(fileChooser));
+ if (uri) {
+ webkit_web_view_execute_editing_command_with_argument(window->webView, WEBKIT_EDITING_COMMAND_INSERT_IMAGE, uri);
+ g_free(uri);
+ }
+ }
+
+ gtk_widget_destroy(fileChooser);
+}
+
+static void insertLinkCommandCallback(GtkWidget*widget, BrowserWindow *window)
+{
+ GtkWidget *dialog = gtk_dialog_new_with_buttons("Insert Link", GTK_WINDOW(window), GTK_DIALOG_MODAL, "Insert", GTK_RESPONSE_ACCEPT, NULL);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
+ GtkWidget *entry = gtk_entry_new();
+ gtk_entry_set_placeholder_text(GTK_ENTRY(entry), "URL");
+ gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), entry);
+ gtk_widget_show(entry);
+
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+ const char *url = gtk_entry_get_text(GTK_ENTRY(entry));
+ if (url && *url)
+ webkit_web_view_execute_editing_command_with_argument(window->webView, WEBKIT_EDITING_COMMAND_CREATE_LINK, url);
+ }
+
+ gtk_widget_destroy(dialog);
+}
+
</ins><span class="cx"> static void browserWindowEditingCommandToggleButtonSetActive(BrowserWindow *window, GtkWidget *button, gboolean active)
</span><span class="cx"> {
</span><span class="cx"> g_signal_handlers_block_by_func(button, G_CALLBACK(editingCommandCallback), window);
</span><span class="lines">@@ -879,6 +919,22 @@
</span><span class="cx"> gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
</span><span class="cx"> gtk_widget_show(GTK_WIDGET(item));
</span><span class="cx">
</span><ins>+ item = gtk_separator_tool_item_new();
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new(NULL, NULL);
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "insert-image");
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(insertImageCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
+ item = gtk_tool_button_new(NULL, NULL);
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), "insert-link");
+ g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(insertLinkCommandCallback), window);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+ gtk_widget_show(GTK_WIDGET(item));
+
</ins><span class="cx"> gtk_box_pack_start(GTK_BOX(window->mainBox), toolbar, FALSE, FALSE, 0);
</span><span class="cx"> gtk_widget_show(toolbar);
</span><span class="cx"> }
</span><span class="lines">@@ -1087,7 +1143,7 @@
</span><span class="cx"> gtk_widget_show(GTK_WIDGET(window->webView));
</span><span class="cx">
</span><span class="cx"> if (webkit_web_view_is_editable(window->webView))
</span><del>- webkit_web_view_load_html(window->webView, "<html></html>", NULL);
</del><ins>+ webkit_web_view_load_html(window->webView, "<html></html>", "file:///");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void browser_window_class_init(BrowserWindowClass *klass)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp (187219 => 187220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2015-07-23 07:58:15 UTC (rev 187219)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2015-07-23 08:23:25 UTC (rev 187220)
</span><span class="lines">@@ -401,6 +401,58 @@
</span><span class="cx"> g_assert_cmpuint(typingAttributes, ==, WEBKIT_EDITOR_TYPING_ATTRIBUTE_NONE);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void testWebViewEditorInsertImage(EditorTest* test, gconstpointer)
+{
+ test->loadHtml("<html><body></body></html>", "file:///");
+ test->waitUntilLoadFinished();
+ test->setEditable(true);
+
+ GUniquePtr<char> imagePath(g_build_filename(Test::getResourcesDir().data(), "blank.ico", nullptr));
+ GUniquePtr<char> imageURI(g_filename_to_uri(imagePath.get(), nullptr, nullptr));
+ webkit_web_view_execute_editing_command_with_argument(test->m_webView, WEBKIT_EDITING_COMMAND_INSERT_IMAGE, imageURI.get());
+ GUniqueOutPtr<GError> error;
+ WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementsByTagName('IMG')[0].src", &error.outPtr());
+ g_assert(javascriptResult);
+ g_assert(!error);
+ GUniquePtr<char> resultString(WebViewTest::javascriptResultToCString(javascriptResult));
+ g_assert_cmpstr(resultString.get(), ==, imageURI.get());
+}
+
+static void testWebViewEditorCreateLink(EditorTest* test, gconstpointer)
+{
+ test->loadHtml("<html><body onload=\"document.getSelection().selectAllChildren(document.body);\">webkitgtk.org</body></html>", nullptr);
+ test->waitUntilLoadFinished();
+ test->setEditable(true);
+
+ static const char* webkitGTKURL = "http://www.webkitgtk.org/";
+ webkit_web_view_execute_editing_command_with_argument(test->m_webView, WEBKIT_EDITING_COMMAND_CREATE_LINK, webkitGTKURL);
+ GUniqueOutPtr<GError> error;
+ WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementsByTagName('A')[0].href;", &error.outPtr());
+ g_assert(javascriptResult);
+ g_assert(!error);
+ GUniquePtr<char> resultString(WebViewTest::javascriptResultToCString(javascriptResult));
+ g_assert_cmpstr(resultString.get(), ==, webkitGTKURL);
+ javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementsByTagName('A')[0].innerText;", &error.outPtr());
+ g_assert(javascriptResult);
+ g_assert(!error);
+ resultString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
+ g_assert_cmpstr(resultString.get(), ==, "webkitgtk.org");
+
+ // When there isn't text selected, the URL is used as link text.
+ webkit_web_view_execute_editing_command(test->m_webView, "MoveToEndOfLine");
+ webkit_web_view_execute_editing_command_with_argument(test->m_webView, WEBKIT_EDITING_COMMAND_CREATE_LINK, webkitGTKURL);
+ javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementsByTagName('A')[1].href;", &error.outPtr());
+ g_assert(javascriptResult);
+ g_assert(!error);
+ resultString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
+ g_assert_cmpstr(resultString.get(), ==, webkitGTKURL);
+ javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementsByTagName('A')[1].innerText;", &error.outPtr());
+ g_assert(javascriptResult);
+ g_assert(!error);
+ resultString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
+ g_assert_cmpstr(resultString.get(), ==, webkitGTKURL);
+}
+
</ins><span class="cx"> void beforeAll()
</span><span class="cx"> {
</span><span class="cx"> EditorTest::add("WebKitWebView", "editable/editable", testWebViewEditorEditable);
</span><span class="lines">@@ -409,6 +461,8 @@
</span><span class="cx"> EditorTest::add("WebKitWebView", "select-all/non-editable", testWebViewEditorSelectAllNonEditable);
</span><span class="cx"> EditorTest::add("WebKitWebView", "select-all/editable", testWebViewEditorSelectAllEditable);
</span><span class="cx"> EditorTest::add("WebKitWebView", "editor-state/typing-attributes", testWebViewEditorEditorStateTypingAttributes);
</span><ins>+ EditorTest::add("WebKitWebView", "insert/image", testWebViewEditorInsertImage);
+ EditorTest::add("WebKitWebView", "insert/link", testWebViewEditorCreateLink);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void afterAll()
</span></span></pre>
</div>
</div>
</body>
</html>