<!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>[190345] 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/190345">190345</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-09-30 05:55:17 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Build error with -DENABLE_SPELLCHECK=OFF
https://bugs.webkit.org/show_bug.cgi?id=146904
Reviewed by Carlos Garcia Campos.
Add ifdef guards to allow building when SPELLCHECK is not enabled.
* UIProcess/gtk/TextCheckerGtk.cpp:
(WebKit::TextChecker::isContinuousSpellCheckingAllowed):
(WebKit::TextChecker::setContinuousSpellCheckingEnabled):
(WebKit::TextChecker::setGrammarCheckingEnabled):
(WebKit::TextChecker::continuousSpellCheckingEnabledStateChanged):
(WebKit::TextChecker::grammarCheckingEnabledStateChanged):
(WebKit::TextChecker::checkSpellingOfString):
(WebKit::TextChecker::getGuessesForWord):
(WebKit::TextChecker::learnWord):
(WebKit::TextChecker::ignoreWord):
(WebKit::TextChecker::requestCheckingOfString):
(WebKit::TextChecker::checkTextOfParagraph):
(WebKit::TextChecker::setSpellCheckingLanguages):
(WebKit::TextChecker::loadedSpellCheckingLanguages):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190344 => 190345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-30 09:55:59 UTC (rev 190344)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-30 12:55:17 UTC (rev 190345)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-30 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] Build error with -DENABLE_SPELLCHECK=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=146904
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add ifdef guards to allow building when SPELLCHECK is not enabled.
+
+ * UIProcess/gtk/TextCheckerGtk.cpp:
+ (WebKit::TextChecker::isContinuousSpellCheckingAllowed):
+ (WebKit::TextChecker::setContinuousSpellCheckingEnabled):
+ (WebKit::TextChecker::setGrammarCheckingEnabled):
+ (WebKit::TextChecker::continuousSpellCheckingEnabledStateChanged):
+ (WebKit::TextChecker::grammarCheckingEnabledStateChanged):
+ (WebKit::TextChecker::checkSpellingOfString):
+ (WebKit::TextChecker::getGuessesForWord):
+ (WebKit::TextChecker::learnWord):
+ (WebKit::TextChecker::ignoreWord):
+ (WebKit::TextChecker::requestCheckingOfString):
+ (WebKit::TextChecker::checkTextOfParagraph):
+ (WebKit::TextChecker::setSpellCheckingLanguages):
+ (WebKit::TextChecker::loadedSpellCheckingLanguages):
+
</ins><span class="cx"> 2015-09-30 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Support HiDPI Properly in WebKitGtk+ with the TextureMapper
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (190344 => 190345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-09-30 09:55:59 UTC (rev 190344)
+++ trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-09-30 12:55:17 UTC (rev 190345)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "TextBreakIterator.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><del>-#include "WebTextChecker.h"
</del><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/TextCheckerEnchant.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -40,11 +39,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> static WebCore::TextCheckerEnchant& enchantTextChecker()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebCore::TextCheckerEnchant> checker;
</span><span class="cx"> return checker;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> TextCheckerState& checkerState()
</span><span class="cx"> {
</span><span class="lines">@@ -63,41 +64,63 @@
</span><span class="cx"> return checkerState();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> static void updateStateForAllProcessPools()
</span><span class="cx"> {
</span><span class="cx"> for (const auto& processPool : WebProcessPool::allProcessPools())
</span><span class="cx"> processPool->textCheckerStateChanged();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool TextChecker::isContinuousSpellCheckingAllowed()
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> return true;
</span><ins>+#else
+ return false;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::setContinuousSpellCheckingEnabled(bool isContinuousSpellCheckingEnabled)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> if (checkerState().isContinuousSpellCheckingEnabled == isContinuousSpellCheckingEnabled)
</span><span class="cx"> return;
</span><span class="cx"> checkerState().isContinuousSpellCheckingEnabled = isContinuousSpellCheckingEnabled;
</span><span class="cx"> updateStateForAllProcessPools();
</span><ins>+#else
+ UNUSED_PARAM(isContinuousSpellCheckingEnabled);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::setGrammarCheckingEnabled(bool isGrammarCheckingEnabled)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> if (checkerState().isGrammarCheckingEnabled == isGrammarCheckingEnabled)
</span><span class="cx"> return;
</span><span class="cx"> checkerState().isGrammarCheckingEnabled = isGrammarCheckingEnabled;
</span><span class="cx"> updateStateForAllProcessPools();
</span><ins>+#else
+ UNUSED_PARAM(isGrammarCheckingEnabled);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::continuousSpellCheckingEnabledStateChanged(bool enabled)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> checkerState().isContinuousSpellCheckingEnabled = enabled;
</span><ins>+#else
+ UNUSED_PARAM(enabled);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::grammarCheckingEnabledStateChanged(bool enabled)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> checkerState().isGrammarCheckingEnabled = enabled;
</span><ins>+#else
+ UNUSED_PARAM(enabled);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int64_t TextChecker::uniqueSpellDocumentTag(WebPageProxy*)
</span><span class="lines">@@ -111,9 +134,15 @@
</span><span class="cx">
</span><span class="cx"> void TextChecker::checkSpellingOfString(int64_t /* spellDocumentTag */, StringView text, int32_t& misspellingLocation, int32_t& misspellingLength)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> misspellingLocation = -1;
</span><span class="cx"> misspellingLength = 0;
</span><span class="cx"> enchantTextChecker().checkSpellingOfString(text.toStringWithoutCopying(), misspellingLocation, misspellingLength);
</span><ins>+#else
+ UNUSED_PARAM(text);
+ UNUSED_PARAM(misspellingLocation);
+ UNUSED_PARAM(misspellingLength);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::checkGrammarOfString(int64_t /* spellDocumentTag */, StringView /* text */, Vector<WebCore::GrammarDetail>& /* grammarDetails */, int32_t& /* badGrammarLocation */, int32_t& /* badGrammarLength */)
</span><span class="lines">@@ -139,21 +168,35 @@
</span><span class="cx">
</span><span class="cx"> void TextChecker::getGuessesForWord(int64_t /* spellDocumentTag */, const String& word, const String& /* context */, Vector<String>& guesses)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> guesses = enchantTextChecker().getGuessesForWord(word);
</span><ins>+#else
+ UNUSED_PARAM(word);
+ UNUSED_PARAM(guesses);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::learnWord(int64_t /* spellDocumentTag */, const String& word)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> enchantTextChecker().learnWord(word);
</span><ins>+#else
+ UNUSED_PARAM(word);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::ignoreWord(int64_t /* spellDocumentTag */, const String& word)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> enchantTextChecker().ignoreWord(word);
</span><ins>+#else
+ UNUSED_PARAM(word);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::requestCheckingOfString(PassRefPtr<TextCheckerCompletion> completion)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> if (!completion)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -162,9 +205,12 @@
</span><span class="cx"> ASSERT(request.mask() != TextCheckingTypeNone);
</span><span class="cx">
</span><span class="cx"> completion->didFinishCheckingText(checkTextOfParagraph(completion->spellDocumentTag(), request.text(), request.mask()));
</span><ins>+#else
+ UNUSED_PARAM(completion);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(UNIFIED_TEXT_CHECKING)
</del><ins>+#if USE(UNIFIED_TEXT_CHECKING) && ENABLE(SPELLCHECK)
</ins><span class="cx"> static unsigned nextWordOffset(StringView text, unsigned currentOffset)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: avoid creating textIterator object here, it could be passed as a parameter.
</span><span class="lines">@@ -190,9 +236,12 @@
</span><span class="cx">
</span><span class="cx"> return wordOffset;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if USE(UNIFIED_TEXT_CHECKING)
</ins><span class="cx"> Vector<TextCheckingResult> TextChecker::checkTextOfParagraph(int64_t spellDocumentTag, StringView text, uint64_t checkingTypes)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> if (!(checkingTypes & TextCheckingTypeSpelling))
</span><span class="cx"> return Vector<TextCheckingResult>();
</span><span class="cx">
</span><span class="lines">@@ -225,17 +274,31 @@
</span><span class="cx"> offset = nextWordOffset(text.substring(0, lengthStrip), offset);
</span><span class="cx"> }
</span><span class="cx"> return paragraphCheckingResult;
</span><ins>+#else
+ UNUSED_PARAM(spellDocumentTag);
+ UNUSED_PARAM(text);
+ UNUSED_PARAM(checkingTypes);
+ return Vector<TextCheckingResult>();
+#endif // ENABLE(SPELLCHECK)
</ins><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // USE(UNIFIED_TEXT_CHECKING)
</ins><span class="cx">
</span><span class="cx"> void TextChecker::setSpellCheckingLanguages(const Vector<String>& languages)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> enchantTextChecker().updateSpellCheckingLanguages(languages);
</span><ins>+#else
+ UNUSED_PARAM(languages);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> TextChecker::loadedSpellCheckingLanguages()
</span><span class="cx"> {
</span><ins>+#if ENABLE(SPELLCHECK)
</ins><span class="cx"> return enchantTextChecker().loadedSpellCheckingLanguages();
</span><ins>+#else
+ return Vector<String>();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>