<!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>[186175] 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/186175">186175</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-01 07:51:28 -0700 (Wed, 01 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/183936">r183936</a>): Test /webkit2/WebKitWebContext/spell-checker fails since <a href="http://trac.webkit.org/projects/webkit/changeset/183936">r183936</a>
https://bugs.webkit.org/show_bug.cgi?id=144828
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
Instead of setting spell checking languages unconditionally when building int
developer mode, add some C API that allows setting them in WebKitTestRunner.
* PlatformGTK.cmake: Add the new C API file to the source list.
* UIProcess/API/C/gtk/WKTextCheckerGtk.cpp:
(WKTextCheckerSetSpellCheckingLanguages): Added this function which allows settings
the spell checking languages from the C API.
* UIProcess/API/C/gtk/WKTextCheckerGtk.h: Added.
* UIProcess/gtk/TextCheckerGtk.cpp:
(WebKit::enchantTextChecker): Remove the hack which sets the spell checking languages automatically
for development builds.
Tools:
* WebKitTestRunner/gtk/main.cpp:
(main): Use the new WKTextChecker API to set the spell checking languages
when the process is starting up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkmaincpp">trunk/Tools/WebKitTestRunner/gtk/main.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICgtkWKTextCheckerGtkcpp">trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICgtkWKTextCheckerGtkh">trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186174 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-01 08:55:02 UTC (rev 186174)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] REGRESSION(r183936): Test /webkit2/WebKitWebContext/spell-checker fails since r183936
+ https://bugs.webkit.org/show_bug.cgi?id=144828
+
+ Reviewed by Carlos Garcia Campos.
+
+ Instead of setting spell checking languages unconditionally when building int
+ developer mode, add some C API that allows setting them in WebKitTestRunner.
+
+ * PlatformGTK.cmake: Add the new C API file to the source list.
+ * UIProcess/API/C/gtk/WKTextCheckerGtk.cpp:
+ (WKTextCheckerSetSpellCheckingLanguages): Added this function which allows settings
+ the spell checking languages from the C API.
+ * UIProcess/API/C/gtk/WKTextCheckerGtk.h: Added.
+ * UIProcess/gtk/TextCheckerGtk.cpp:
+ (WebKit::enchantTextChecker): Remove the hack which sets the spell checking languages automatically
+ for development builds.
+
</ins><span class="cx"> 2015-07-01 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Numerous CGColor leaks in swipe gestures
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (186174 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-01 08:55:02 UTC (rev 186174)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx">
</span><span class="cx"> UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp
</span><span class="cx"> UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
</span><ins>+ UIProcess/API/C/gtk/WKTextCheckerGtk.cpp
</ins><span class="cx"> UIProcess/API/C/gtk/WKView.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/API/C/soup/WKCookieManagerSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICgtkWKTextCheckerGtkcppfromrev186174trunkToolsWebKitTestRunnergtkmaincpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.cpp (from rev 186174, trunk/Tools/WebKitTestRunner/gtk/main.cpp) (0 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.cpp 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WKTextCheckerGtk.h"
+
+#include "TextChecker.h"
+
+void WKTextCheckerSetSpellCheckingLanguages(const char* const* languages)
+{
+#if ENABLE(SPELLCHECK)
+ Vector<String> spellCheckingLanguages;
+ for (size_t i = 0; languages[i]; ++i)
+ spellCheckingLanguages.append(String::fromUTF8(languages[i]));
+ WebKit::TextChecker::setSpellCheckingLanguages(spellCheckingLanguages);
+#endif
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICgtkWKTextCheckerGtkhfromrev186174trunkToolsWebKitTestRunnergtkmaincpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.h (from rev 186174, trunk/Tools/WebKitTestRunner/gtk/main.cpp) (0 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKTextCheckerGtk.h 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKTextCheckerGtk_h
+#define WKTextCheckerGtk_h
+
+#include <WebKit/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT void WKTextCheckerSetSpellCheckingLanguages(const char* const* languages);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKTextCheckerGtk_h */
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (186174 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-07-01 08:55:02 UTC (rev 186174)
+++ trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -43,18 +43,6 @@
</span><span class="cx"> static WebCore::TextCheckerEnchant& enchantTextChecker()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebCore::TextCheckerEnchant> checker;
</span><del>-
-#if ENABLE(DEVELOPER_MODE)
- // This is a bit of a hack, but ensures that for testing purposes,
- // spell checking is properly initialized in WebKitTestRunner while
- // running layout tests. We should consider replacing this with some
- // more accessible C API at some point.
- static std::once_flag onceFlag;
- std::call_once(onceFlag, [] {
- checker.get().updateSpellCheckingLanguages(Vector<String> { "en_US" });
- });
-#endif
-
</del><span class="cx"> return checker;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (186174 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-01 08:55:02 UTC (rev 186174)
+++ trunk/Tools/ChangeLog 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] REGRESSION(r183936): Test /webkit2/WebKitWebContext/spell-checker fails since r183936
+ https://bugs.webkit.org/show_bug.cgi?id=144828
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebKitTestRunner/gtk/main.cpp:
+ (main): Use the new WKTextChecker API to set the spell checking languages
+ when the process is starting up.
+
</ins><span class="cx"> 2015-06-30 Andy VanWagoner <thetalecrafter@gmail.com>
</span><span class="cx">
</span><span class="cx"> Implement ECMAScript Internationalization API
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/main.cpp (186174 => 186175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/main.cpp 2015-07-01 08:55:02 UTC (rev 186174)
+++ trunk/Tools/WebKitTestRunner/gtk/main.cpp 2015-07-01 14:51:28 UTC (rev 186175)
</span><span class="lines">@@ -26,12 +26,21 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #include "TestController.h"
</span><ins>+#include <WebKit/WKTextCheckerGtk.h>
</ins><span class="cx"> #include <gtk/gtk.h>
</span><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><span class="cx"> gtk_init(&argc, &argv);
</span><ins>+
+ GRefPtr<GPtrArray> languages = adoptGRef(g_ptr_array_new());
+ g_ptr_array_add(languages.get(), const_cast<gpointer>(static_cast<const void*>("en_US")));
+ g_ptr_array_add(languages.get(), nullptr);
+ WKTextCheckerSetSpellCheckingLanguages(reinterpret_cast<const char* const*>(languages->pdata));
+
</ins><span class="cx"> // Prefer the not installed web and plugin processes.
</span><span class="cx"> WTR::TestController controller(argc, const_cast<const char**>(argv));
</span><ins>+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>