Attachment 373463 Details for Bug 199469 – Patch

[patch] Patch

bug-199469-20190704163716.patch (text/plain), 2.05 KB, created by Konstantin Tokarev on 2019-07-04 06:37:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Tokarev

Created: 2019-07-04 06:37:18 PDT

Size: 2.05 KB

patch

obsolete

>Subversion Revision: 247138
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 07cd6ac5cbeb6bd3bc7f3289a272d6dfed27db49..ec9bd41c76a2eb8edbfd2b4fbd28dfd7e0f64009 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-04  Konstantin Tokarev  <annulen@yandex.ru>
>+
>+        HyphenationLibHyphen: Include GLib-related headers only if ENABLE(DEVELOPER_MODE) is true
>+        https://bugs.webkit.org/show_bug.cgi?id=199469
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * platform/text/hyphen/HyphenationLibHyphen.cpp:
>+
> 2019-07-03  Eric Carlson  <eric.carlson@apple.com>
> 
>         [MSE] Add more debug and error logging
>diff --git a/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp b/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp
>index fe40fb259b93f9d34e56f23cd1dd1103c65cc9a8..12baa4c4d3e9e63f7ff81c5e2b1194b8bb8a9c05 100644
>--- a/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp
>+++ b/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp
>@@ -36,12 +36,15 @@
> #include <wtf/HashMap.h>
> #include <wtf/NeverDestroyed.h>
> #include <wtf/TinyLRUCache.h>
>-#include <wtf/glib/GLibUtilities.h>
>-#include <wtf/glib/GUniquePtr.h>
> #include <wtf/text/AtomStringHash.h>
> #include <wtf/text/CString.h>
> #include <wtf/text/StringView.h>
> 
>+#if PLATFORM(GTK)
>+#include <wtf/glib/GLibUtilities.h>
>+#include <wtf/glib/GUniquePtr.h>
>+#endif
>+
> namespace WebCore {
> 
> static const char* const gDictionaryDirectories[] = {
>@@ -85,6 +88,8 @@ static void scanDirectoryForDictionaries(const char* directoryPath, HashMap<Atom
> }
> 
> #if ENABLE(DEVELOPER_MODE)
>+
>+#if PLATFORM(GTK)
> static CString topLevelPath()
> {
>     if (const char* topLevelDirectory = g_getenv("WEBKIT_TOP_LEVEL"))
>@@ -108,6 +113,7 @@ static CString webkitBuildDirectory()
>     GUniquePtr<char> outputDir(g_build_filename(topLevelPath().data(), "WebKitBuild", nullptr));
>     return outputDir.get();
> }
>+#endif // PLATFORM(GTK)
> 
> static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomString, Vector<String>>& availableLocales)
> {

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199469: 373421 | 373447 | 373463