Attachment 372760 Details for Bug 199159 – Patch

[patch] Patch

bug-199159-20190624100444.patch (text/plain), 59.00 KB, created by Michael Catanzaro on 2019-06-24 08:04:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-24 08:04:45 PDT

Size: 59.00 KB

patch

obsolete

>Subversion Revision: 246733
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 180836181a81dba00456fd5420a14e442254a1e3..87c011305dd0433180d1de48f3926c13d1c0e3c9 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
>+        https://bugs.webkit.org/show_bug.cgi?id=199159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/URLParser.cpp:
>+        (WTF::URLParser::internationalDomainNameTranscoder):
>+
> 2019-06-23  Simon Fraser  <simon.fraser@apple.com>
> 
>         Add OverflowScrollProxyNodes to the scrolling tree
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9cebaa19562dfca18abd38a652f217e3a38f2c34..dfdd53df453f0e8a179261dda026df05a46e2682 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
>+        https://bugs.webkit.org/show_bug.cgi?id=199159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
>+        (webkitAccessibleTextGetStringAtOffset):
>+        * platform/UserAgentQuirks.cpp:
>+        (WebCore::urlRequiresMacintoshPlatform):
>+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
>+        (WebCore::NetworkStorageSession::saveCredentialToPersistentStorage):
>+        * rendering/RenderThemeGtk.cpp:
>+        (WebCore::RenderThemeGtk::adjustTextFieldStyle const):
>+
> 2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Add user agent quirk for Google Drive
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 48db50c8ad11671d16c5e1fbf71e5b0898777776..5a19fad2a407bf48ba57c2fe9621e5cf9b70fddc 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
>+        https://bugs.webkit.org/show_bug.cgi?id=199159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:
>+        * gtk/NEWS:
>+
> 2019-06-24  Alexander Mikhaylenko  <exalm7659@gmail.com>
> 
>         [GTK] Navigation gesture should use dark fallback bg color on dark themes
>diff --git a/Source/WTF/wtf/URLParser.cpp b/Source/WTF/wtf/URLParser.cpp
>index b9cbec046d51d66485a9d8a52b5c49f344aaeaaa..cdfc0f82160d5d7985f5d01d19b2449b1d050c73 100644
>--- a/Source/WTF/wtf/URLParser.cpp
>+++ b/Source/WTF/wtf/URLParser.cpp
>@@ -2856,8 +2856,6 @@ const UIDNA& URLParser::internationalDomainNameTranscoder()
>     static std::once_flag onceFlag;
>     std::call_once(onceFlag, [] {
>         UErrorCode error = U_ZERO_ERROR;
>-        // Warning: Please contact a WebKitGTK+ developer if changing these flags.
>-        // They should be synced with ephy_uri_decode() in ephy-uri-helpers.c.
>         encoder = uidna_openUTS46(UIDNA_CHECK_BIDI | UIDNA_CHECK_CONTEXTJ | UIDNA_NONTRANSITIONAL_TO_UNICODE | UIDNA_NONTRANSITIONAL_TO_ASCII, &error);
>         RELEASE_ASSERT(U_SUCCESS(error));
>         RELEASE_ASSERT(encoder);
>diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
>index 084e2f67b2d71658c03c9243a4dc2cf14c714e89..3f091d18ec44bd2117d1938c4b292b28d29f8d7c 100644
>--- a/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
>+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
>@@ -1214,9 +1214,12 @@ static gchar* webkitAccessibleTextGetStringAtOffset(AtkText* text, gint offset,
>     // ATK_TEXT_BOUNDARY_*_START boundaries, so for now we just need to translate the
>     // granularity to the right old boundary and reuse the code for the old API.
>     // However, this should be simplified later on (and a lot of code removed) once
>-    // WebKitGTK+ depends on ATK >= 2.9.4 *and* can safely assume that a version of
>+    // WebKitGTK depends on ATK >= 2.9.4 *and* can safely assume that a version of
>     // AT-SPI2 new enough not to include the old APIs is being used. But until then,
>     // we will have to live with both the old and new APIs implemented here.
>+    // FIXME: WebKit nowadays depends on much newer ATK and we can safely assume AT-SPI2
>+    // isn't ancient. But whoever wrote this code didn't use ATK_CHECK_VERSION() guards,
>+    // so it's unclear what is supposed to be changed here.
>     AtkTextBoundary boundaryType = ATK_TEXT_BOUNDARY_CHAR;
>     switch (granularity) {
>     case ATK_TEXT_GRANULARITY_CHAR:
>diff --git a/Source/WebCore/platform/UserAgentQuirks.cpp b/Source/WebCore/platform/UserAgentQuirks.cpp
>index 5df57696f779a8eaf1586577c3b7d2c67961f7e3..35849189edb6627eeec07aac23dbd973e9c828f6 100644
>--- a/Source/WebCore/platform/UserAgentQuirks.cpp
>+++ b/Source/WebCore/platform/UserAgentQuirks.cpp
>@@ -75,28 +75,28 @@ static bool urlRequiresMacintoshPlatform(const URL& url)
>     String domain = url.host().toString();
>     String baseDomain = topPrivatelyControlledDomain(domain);
> 
>-    // At least finance.yahoo.com displays a mobile version with WebKitGTK+'s standard user agent.
>+    // At least finance.yahoo.com displays a mobile version with WebKitGTK's standard user agent.
>     if (baseDomain == "yahoo.com")
>         return true;
> 
>-    // taobao.com displays a mobile version with WebKitGTK+'s standard user agent.
>+    // taobao.com displays a mobile version with WebKitGTK's standard user agent.
>     if (baseDomain == "taobao.com")
>         return true;
> 
>-    // web.whatsapp.com completely blocks users with WebKitGTK+'s standard user agent.
>+    // web.whatsapp.com completely blocks users with WebKitGTK's standard user agent.
>     if (baseDomain == "whatsapp.com")
>         return true;
> 
>-    // paypal.com completely blocks users with WebKitGTK+'s standard user agent.
>+    // paypal.com completely blocks users with WebKitGTK's standard user agent.
>     if (baseDomain == "paypal.com")
>         return true;
> 
>     // chase.com displays a huge "please update your browser" warning with
>-    // WebKitGTK+'s standard user agent.
>+    // WebKitGTK's standard user agent.
>     if (baseDomain == "chase.com")
>         return true;
> 
>-    // Microsoft Outlook Web App forces users with WebKitGTK+'s standard user
>+    // Microsoft Outlook Web App forces users with WebKitGTK's standard user
>     // agent to use the light version. Earlier versions even block users from
>     // accessing the calendar.
>     if (domain == "outlook.live.com"
>@@ -105,7 +105,7 @@ static bool urlRequiresMacintoshPlatform(const URL& url)
>         return true;
> 
>     // Google Docs and Google Drive both show a scary unsupported browser
>-    // warning with WebKitGTK+'s standard user agent.
>+    // warning with WebKitGTK's standard user agent.
>     if (domain == "docs.google.com"
>         || domain == "drive.google.com")
>         return true;
>diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>index f6641efeb44c73434e4d15a4a5abedd856f20e6f..053f6b91a6425ad8ad20da7b6087d625669b9ee5 100644
>--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>@@ -263,7 +263,7 @@ void NetworkStorageSession::saveCredentialToPersistentStorage(const ProtectionSp
>     g_hash_table_insert(attributes.get(), g_strdup("user"), g_strdup(credential.user().utf8().data()));
>     CString utf8Password = credential.password().utf8();
>     GRefPtr<SecretValue> newSecretValue = adoptGRef(secret_value_new(utf8Password.data(), utf8Password.length(), "text/plain"));
>-    secret_service_store(nullptr, SECRET_SCHEMA_COMPAT_NETWORK, attributes.get(), SECRET_COLLECTION_DEFAULT, _("WebKitGTK+ password"),
>+    secret_service_store(nullptr, SECRET_SCHEMA_COMPAT_NETWORK, attributes.get(), SECRET_COLLECTION_DEFAULT, _("WebKitGTK password"),
>         newSecretValue.get(), nullptr, nullptr, nullptr);
> #else
>     UNUSED_PARAM(protectionSpace);
>diff --git a/Source/WebCore/rendering/RenderThemeGtk.cpp b/Source/WebCore/rendering/RenderThemeGtk.cpp
>index 04487ddb9f258c48898273b2c35b51a32e72c999..6dc19ca3d8e190dfc9c74dfc85df97be6c250ee7 100644
>--- a/Source/WebCore/rendering/RenderThemeGtk.cpp
>+++ b/Source/WebCore/rendering/RenderThemeGtk.cpp
>@@ -500,7 +500,7 @@ void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&, RenderStyle& style, co
> 
>     // The default theme for the GTK+ port uses very wide spin buttons (66px) compared to what other
>     // browsers use (~13 px). And unfortunately, most of the web developers won't test how their site
>-    // renders on WebKitGTK+. To ensure that spin buttons don't end up covering the values of the input
>+    // renders on WebKitGTK. To ensure that spin buttons don't end up covering the values of the input
>     // field, we override the width of the input element and always increment it with the width needed
>     // for the spinbutton (when drawing the spinbutton).
>     int minimumWidth = style.width().intValue() + spinButtonSize().width();
>diff --git a/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp b/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
>index d572c54900c6f5490c8571820f4439661340fa4d..252583c5ec9c44d9cb9b276def6536079278577f 100644
>--- a/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
>@@ -42,7 +42,7 @@ WTF::String WebsiteDataStore::defaultApplicationCacheDirectory()
>     return cacheDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "applications");
> }
> 
>-// FIXME: The other directories in this file are shared between all applications using WebKitGTK+.
>+// FIXME: The other directories in this file are shared between all applications using WebKitGTK.
> // Why is only this directory namespaced to a particular application?
> WTF::String WebsiteDataStore::defaultNetworkCacheDirectory()
> {
>diff --git a/Source/WebKit/gtk/NEWS b/Source/WebKit/gtk/NEWS
>index 0e044fd1a3c83f37f1515b37da0d53c6f54cee10..ae78717798f5fef9de4e192dfa3e9fa63c848146 100644
>--- a/Source/WebKit/gtk/NEWS
>+++ b/Source/WebKit/gtk/NEWS
>@@ -1,3 +1,11 @@
>+================
>+WebKitGTK 2.25.3
>+================
>+
>+What's new in WebKitGTK 2.25.3?
>+
>+  - 
>+
> ================
> WebKitGTK 2.25.2
> ================
>diff --git a/Source/cmake/FindGLIB.cmake b/Source/cmake/FindGLIB.cmake
>index 93d3ec547999fb4bef01ccbfd6277858fc200d8a..71c982cd4c1861f89e75053b54f9d0c3d239d20c 100644
>--- a/Source/cmake/FindGLIB.cmake
>+++ b/Source/cmake/FindGLIB.cmake
>@@ -100,7 +100,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS})
>     elseif (${_component} STREQUAL "gio-unix")
>         # gio-unix is compiled as part of the gio library, but the include paths
>         # are separate from the shared glib ones. Since this is currently only used
>-        # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
>+        # by WebKitGTK we don't go to extraordinary measures beyond pkg-config.
>         pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
>     endif ()
> endforeach ()
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ea4594cf348d22b022f95e36dda373cd5c2ca301..34ad11edbcc8f9720c88731b697c38c1598fd819 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,54 @@
>+2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
>+        https://bugs.webkit.org/show_bug.cgi?id=199159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/gtk/README:
>+        * MiniBrowser/gtk/BrowserWindow.c:
>+        * MiniBrowser/gtk/main.c:
>+        (aboutURISchemeRequestCallback):
>+        * Scripts/webkitpy/common/config/contributionareas.py:
>+        * Scripts/webkitpy/common/config/contributors.json:
>+        * Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py:
>+        * TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp:
>+        * TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp:
>+        (testWebViewResources):
>+        * TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
>+        (testWebViewMouseTarget):
>+        * TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp:
>+        (testWebExtensionGetTitle):
>+        (testDocumentLoadedSignal):
>+        (testWebExtensionFormControlsAssociated):
>+        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
>+        (testWebKitSettingsUserAgent):
>+        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp:
>+        (testWebViewRunJavaScript):
>+        * TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp:
>+        (main):
>+        * TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp:
>+        (prepareContextMenuTestView):
>+        (testContextMenuPopulateMenu):
>+        (testContextMenuCustomMenu):
>+        (testContextMenuDisableMenu):
>+        (testContextMenuSubMenu):
>+        (testContextMenuDismissed):
>+        (testContextMenuWebExtensionMenu):
>+        (testContextMenuWebExtensionNode):
>+        * TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp:
>+        (testInspectorDefault):
>+        (testInspectorManualAttachDetach):
>+        (testInspectorCustomContainerDestroyed):
>+        * TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp:
>+        (testWebViewPrint):
>+        (testPrintOperationPrint):
>+        (testPrintOperationErrors):
>+        * gtk/install-dependencies:
>+        * gtk/jhbuild.modules:
>+        * gtkdoc/generate-gtkdoc:
>+        * wpe/install-dependencies:
>+
> 2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Add user agent quirk for Google Drive
>diff --git a/Tools/BuildSlaveSupport/gtk/README b/Tools/BuildSlaveSupport/gtk/README
>index 16fa9e75bd7ffd4c12376c4e93228828d5433bd1..f9f89f9821aeea20edb7cedbcabfb77f380bd2c3 100644
>--- a/Tools/BuildSlaveSupport/gtk/README
>+++ b/Tools/BuildSlaveSupport/gtk/README
>@@ -2,7 +2,7 @@
>  Running a GTK+ build slave under daemontools
> ==============================================
> 
>-This directory contains several scripts which can be used to run a WebKitGTK+
>+This directory contains several scripts which can be used to run a WebKitGTK
> build slave under daemontools [1]. This is convenient because daemontools
> will automatically restart services when they die, and that means less human
> intervention is needed.
>diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c
>index 7fb3abd076854c40a18ba35072ab2a44d9431de9..be36989ffb584ba2ccf45ea44e58230b892800ea 100644
>--- a/Tools/MiniBrowser/gtk/BrowserWindow.c
>+++ b/Tools/MiniBrowser/gtk/BrowserWindow.c
>@@ -72,7 +72,7 @@ struct _BrowserWindowClass {
>     GtkWindowClass parent;
> };
> 
>-static const char *defaultWindowTitle = "WebKitGTK+ MiniBrowser";
>+static const char *defaultWindowTitle = "WebKitGTK MiniBrowser";
> static const gdouble minimumZoomLevel = 0.5;
> static const gdouble maximumZoomLevel = 3;
> static const gdouble defaultZoomLevel = 1;
>diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
>index 9bb44bdd7bd82ab4f3df6ead4bb005dd40166ee3..db81e15d50793b3c1b7928b14843f6ab5a01c814 100644
>--- a/Tools/MiniBrowser/gtk/main.c
>+++ b/Tools/MiniBrowser/gtk/main.c
>@@ -441,7 +441,7 @@ static void aboutURISchemeRequestCallback(WebKitURISchemeRequest *request, WebKi
> 
>     path = webkit_uri_scheme_request_get_path(request);
>     if (!g_strcmp0(path, "minibrowser")) {
>-        contents = g_strdup_printf("<html><body><h1>WebKitGTK+ MiniBrowser</h1><p>The WebKit2 test browser of the GTK+ port.</p><p>WebKit version: %d.%d.%d</p></body></html>",
>+        contents = g_strdup_printf("<html><body><h1>WebKitGTK MiniBrowser</h1><p>The test browser of WebKitGTK</p><p>WebKit version: %d.%d.%d</p></body></html>",
>             webkit_get_major_version(),
>             webkit_get_minor_version(),
>             webkit_get_micro_version());
>diff --git a/Tools/Scripts/webkitpy/common/config/contributionareas.py b/Tools/Scripts/webkitpy/common/config/contributionareas.py
>index 6764e2cd354971e9f25c008009697db87a3f3f21..f3c7ecf72e6f152bab9e2a4a0f3bc1175dd3a11b 100644
>--- a/Tools/Scripts/webkitpy/common/config/contributionareas.py
>+++ b/Tools/Scripts/webkitpy/common/config/contributionareas.py
>@@ -135,7 +135,7 @@ contribution_areas = [
> # FIXME: 'Text Encoding'
> # FIXME: 'Text Layout'
>     _Area('The Chromium Port', ['chromium']),
>-    _Area('The WebKitGTK+ Port', ['gtk']),
>+    _Area('The WebKitGTK Port', ['gtk']),
>     _Area('The Haiku Port', ['haiku']),
>     _Area('The QtWebKit Port', ['qt']),
>     _Area('The WinCE Port', ['wince']),
>diff --git a/Tools/Scripts/webkitpy/common/config/contributors.json b/Tools/Scripts/webkitpy/common/config/contributors.json
>index 64ce879dca81ac37649df35a044f168132cb701b..211d6e1b2431fe22656cf047b99ca5617525093a 100644
>--- a/Tools/Scripts/webkitpy/common/config/contributors.json
>+++ b/Tools/Scripts/webkitpy/common/config/contributors.json
>@@ -262,7 +262,7 @@
>          "alex@igalia.com",
>          "alex@webkit.org"
>       ],
>-      "expertise" : "WebKitGTK+, Cairo graphics backend, ShadowBlur rendering, Epiphany/WebKit Contributor",
>+      "expertise" : "WebKitGTK, Cairo graphics backend, ShadowBlur rendering, Epiphany/WebKit Contributor",
>       "nicks" : [
>          "alexg__"
>       ],
>@@ -448,7 +448,7 @@
>          "alp@atoker.com",
>          "alp@webkit.org"
>       ],
>-      "expertise" : "GTK+ WebKit Port, Cairo graphics backend (including canvas, SVG), CURL HTTP backend",
>+      "expertise" : "WebKitGTK Port, Cairo graphics backend (including canvas, SVG), CURL HTTP backend",
>       "nicks" : [
>          "alp"
>       ],
>@@ -542,7 +542,7 @@
>          "tanty0@gmail.com",
>          "agomez@gnome.org"
>       ],
>-      "expertise" : "WebKitGTK+",
>+      "expertise" : "WebKitGTK",
>       "nicks" : [
>          "tanty",
>          "agomez"
>@@ -637,7 +637,7 @@
>       "emails" : [
>          "wingo@igalia.com"
>       ],
>-      "expertise" : "JavaScriptCore, the WebKitGTK+ port",
>+      "expertise" : "JavaScriptCore, the WebKitGTK port",
>       "nicks" : [
>          "wingo"
>       ],
>@@ -719,7 +719,7 @@
>       "emails" : [
>          "a.obzhirov@samsung.com"
>       ],
>-      "expertise" : "The WebKitGTK+ Port",
>+      "expertise" : "The WebKitGTK Port",
>       "nicks" : [
>          "aobzhirov"
>       ],
>@@ -919,7 +919,7 @@
>          "otte@gnome.org",
>          "otte@webkit.org"
>       ],
>-      "expertise" : "WebKitGTK+ port, GTK+ lead developer",
>+      "expertise" : "WebKitGTK port, GTK lead developer",
>       "nicks" : [
>          "otte"
>       ],
>@@ -979,7 +979,7 @@
>          "self@brendanlong.com",
>          "b.long@cablelabs.com"
>       ],
>-      "expertise" : "WebKitGTK+, GStreamer",
>+      "expertise" : "WebKitGTK, GStreamer",
>       "nicks" : [
>          "brendanlong"
>       ],
>@@ -1022,7 +1022,7 @@
>       "emails" : [
>          "brian.holt@samsung.com"
>       ],
>-      "expertise" : "WebKitGTK+, memory leak detection",
>+      "expertise" : "WebKitGTK, memory leak detection",
>       "nicks" : [
>          "bdholt1"
>       ],
>@@ -1128,7 +1128,7 @@
>       "emails" : [
>          "clopez@igalia.com"
>       ],
>-      "expertise" : "The WebKitGTK+ port, Tools, Build/test infrastructure",
>+      "expertise" : "The WebKitGTK port, Tools, Build/test infrastructure",
>       "nicks" : [
>          "clopez"
>       ],
>@@ -1150,7 +1150,7 @@
>          "carlosgc@gnome.org",
>          "carlosgc@webkit.org"
>       ],
>-      "expertise" : "The WebKitGTK+ Port, WebKit2, Glib unicode backend, GTK+ contributor, Epiphany contributor",
>+      "expertise" : "The WebKitGTK Port, WebKit2, Glib unicode backend, GTK contributor, Epiphany contributor",
>       "nicks" : [
>          "KaL"
>       ],
>@@ -1192,7 +1192,7 @@
>       "emails" : [
>          "changseok@webkit.org"
>       ],
>-      "expertise" : "The WebKitGTK+ port, H/W acceleration, Layout and Rendering",
>+      "expertise" : "The WebKitGTK port, H/W acceleration, Layout and Rendering",
>       "nicks" : [
>          "changseok"
>       ],
>@@ -1357,7 +1357,7 @@
>       "emails" : [
>          "csaavedra@igalia.com"
>       ],
>-      "expertise" : "WebKitGTK+ port, Epiphany developer, HTML Editing",
>+      "expertise" : "WebKitGTK port, Epiphany developer, HTML Editing",
>       "nicks" : [
>          "claudio___"
>       ],
>@@ -1676,7 +1676,7 @@
>       "emails" : [
>          "d.nomiyama@samsung.com"
>       ],
>-      "expertise" : "The WebKitGTK+ Port",
>+      "expertise" : "The WebKitGTK Port",
>       "nicks" : [
>          "dnomi"
>       ],
>@@ -2390,7 +2390,7 @@
>          "gustavo.noronha@collabora.co.uk",
>          "gustavo.noronha@collabora.com"
>       ],
>-      "expertise" : "WebKitGTK+ API, Soup HTTP backend, Debian Packaging, A little bit of Epiphany",
>+      "expertise" : "WebKitGTK API, Soup HTTP backend, Debian Packaging, A little bit of Epiphany",
>       "nicks" : [
>          "kov"
>       ],
>@@ -2402,7 +2402,7 @@
>          "yoon@webkit.org",
>          "ryumiel@company100.net"
>       ],
>-      "expertise" : "Accelerated Compositing, WebKitGTK+",
>+      "expertise" : "Accelerated Compositing, WebKitGTK",
>       "nicks" : [
>          "ryumiel"
>       ],
>@@ -2511,7 +2511,7 @@
>          "zecke@selfish.org",
>          "zecke@webkit.org"
>       ],
>-      "expertise" : "The QtWebKit Port, The GTK+ WebKit Port",
>+      "expertise" : "The QtWebKit Port, The WebKitGTK Port",
>       "nicks" : [
>          "zecke"
>       ],
>@@ -2983,7 +2983,7 @@
>       "emails" : [
>          "jdiggs@igalia.com"
>       ],
>-      "expertise" : "Accessibility, WebKitGTK+",
>+      "expertise" : "Accessibility, WebKitGTK",
>       "nicks" : [
>          "joanie"
>       ],
>@@ -3194,7 +3194,7 @@
>          "joone.hur@intel.com",
>          "joone.hur@collabora.co.uk"
>       ],
>-      "expertise" : "The WebKitGtk+ port",
>+      "expertise" : "The WebKitGTK port",
>       "nicks" : [
>          "joone"
>       ],
>@@ -3912,7 +3912,7 @@
>       "emails" : [
>          "rego@igalia.com"
>       ],
>-      "expertise" : "Layout, CSS, Selection, WebKitGTK+ port",
>+      "expertise" : "Layout, CSS, Selection, WebKitGTK port",
>       "nicks" : [
>          "rego",
>          "mrego"
>@@ -3942,7 +3942,7 @@
>          "mario.prada@samsung.com",
>          "msanchez@igalia.com"
>       ],
>-      "expertise" : "WebKitGTK+, Accessibility, WebKit2, Epiphany/WebKit Contributor",
>+      "expertise" : "WebKitGTK, Accessibility, WebKit2, Epiphany/WebKit Contributor",
>       "nicks" : [
>          "msanchez"
>       ],
>@@ -4012,7 +4012,7 @@
>          "mrobinson@igalia.com",
>          "martin.james.robinson@gmail.com"
>       ],
>-      "expertise" : "The WebKitGTK+ Port, Cairo graphics backend, soup HTTP backend",
>+      "expertise" : "The WebKitGTK Port, Cairo graphics backend, soup HTTP backend",
>       "nicks" : [
>          "mrobinson"
>       ],
>@@ -4173,7 +4173,7 @@
>          "mcatanzaro@igalia.com",
>          "mcatanzaro@gnome.org"
>       ],
>-      "expertise" : "The WebKitGTK+ Port, Epiphany, Soup HTTP Backend",
>+      "expertise" : "The WebKitGTK Port, Epiphany, Soup HTTP Backend",
>       "nicks" : [
>          "mcatanzaro"
>       ],
>@@ -4231,7 +4231,7 @@
>       "emails" : [
>          "magomez@igalia.com"
>       ],
>-      "expertise" : "The WebKitGTK+ port, Accelerated Compositing, HW acceleration",
>+      "expertise" : "The WebKitGTK port, Accelerated Compositing, HW acceleration",
>       "nicks" : [
>          "magomez"
>       ],
>@@ -4732,7 +4732,7 @@
>          "philn@webkit.org",
>          "philn@igalia.com"
>       ],
>-      "expertise" : "WebKitGTK+, Media support (focused on the GStreamer implementation)",
>+      "expertise" : "WebKitGTK, Media support (focused on the GStreamer implementation)",
>       "nicks" : [
>          "philn"
>       ],
>@@ -5155,7 +5155,7 @@
>          "sebastian.droege@collabora.co.uk",
>          "sebastian.droege@collabora.com"
>       ],
>-      "expertise" : "WebKitGTK+, Media support (focused on the GStreamer implementation)",
>+      "expertise" : "WebKitGTK, Media support (focused on the GStreamer implementation)",
>       "nicks" : [
>          "slomo"
>       ],
>@@ -5187,7 +5187,7 @@
>          "svillar@igalia.com",
>          "sergio@webkit.org"
>       ],
>-      "expertise" : "WebKitGTK+ port, WebKit2, CSS Grid Layout, libsoup",
>+      "expertise" : "WebKitGTK port, WebKit2, CSS Grid Layout, libsoup",
>       "nicks" : [
>          "svillar"
>       ],
>@@ -5863,7 +5863,7 @@
>          "sheriff-bot"
>       ]
>    },
>-   "WebKitGTK+ Bugs" : {
>+   "WebKitGTK Bugs" : {
>       "class" : "bot",
>       "emails" : [
>          "bugs-noreply@webkitgtk.org"
>@@ -5903,7 +5903,7 @@
>          "calvaris@igalia.com",
>          "xrcalvar@igalia.com"
>       ],
>-      "expertise" : "WebKitGTK+, GStreamer, Streams API",
>+      "expertise" : "WebKitGTK, GStreamer, Streams API",
>       "nicks" : [
>          "calvaris"
>       ],
>@@ -5916,7 +5916,7 @@
>          "xan@webkit.org",
>          "xlopez@igalia.com"
>       ],
>-      "expertise" : "WebKitGTK+, Soup HTTP Backend, libsoup Contributor, WebKit a11y (focused on the ATK implementation), Epiphany/WebKit maintainer",
>+      "expertise" : "WebKitGTK, Soup HTTP Backend, libsoup Contributor, WebKit a11y (focused on the ATK implementation), Epiphany/WebKit maintainer",
>       "nicks" : [
>          "xan"
>       ],
>diff --git a/Tools/Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py b/Tools/Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py
>index 4f870ce84e1dc6d30e0446742ebc7692497ab473..359c85ff7638cd05afde40fe99224b113abf6953 100644
>--- a/Tools/Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py
>+++ b/Tools/Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py
>@@ -168,16 +168,16 @@ class ChangeLogAnalyzerTest(CommandsTest):
>             'foo/platform/audio/gstreamer/AudioDestinationGStreamer.h': 1, 'foo/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp': 1,
>             'foo/platform/audio/gtk/AudioBusGtk.cpp': 1}
>         author_expectation_for_audio_patch = {'reviews': {'files': {}, 'total': 0, 'areas': {}},
>-            'patches': {'files': files_for_audio_patch, 'areas': {'The WebKitGTK+ Port': 1}, 'unreviewed': 0, 'reviewed': 1}}
>+            'patches': {'files': files_for_audio_patch, 'areas': {'The WebKitGTK Port': 1}, 'unreviewed': 0, 'reviewed': 1}}
>         self.assertEqual(analyzer.contributors_statistics()[u'Martin Robinson'],
>-            {'reviews': {'files': files_for_audio_patch, 'total': 1, 'areas': {'The WebKitGTK+ Port': 1}},
>+            {'reviews': {'files': files_for_audio_patch, 'total': 1, 'areas': {'The WebKitGTK Port': 1}},
>                 'patches': {'files': {}, 'areas': {}, 'unreviewed': 0, 'reviewed': 0}})
>         self.assertEqual(analyzer.contributors_statistics()[u'Philippe Normand'], author_expectation_for_audio_patch)
>         self.assertEqual(analyzer.contributors_statistics()[u'Zan Dobersek'], author_expectation_for_audio_patch)
> 
>         areas_statistics = analyzer.areas_statistics()
>         areas_with_patches = [area for area in areas_statistics if areas_statistics[area]['reviewed'] or areas_statistics[area]['unreviewed']]
>-        self.assertEqual(set(areas_with_patches), set(['Bindings', 'Network', 'The WebKitGTK+ Port']))
>+        self.assertEqual(set(areas_with_patches), set(['Bindings', 'Network', 'The WebKitGTK Port']))
>         self.assertEqual(areas_statistics['Bindings'], {'unreviewed': 1, 'reviewed': 0, 'contributors':
>             {u'Kevin Ollivier': {'reviews': 0, 'unreviewed': 1, 'reviewed': 0}}})
>         self.assertEqual(areas_statistics['Network'], {'unreviewed': 0, 'reviewed': 1, 'contributors':
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp
>index dd69b4a5fba6acc6cc20cd0c76b5195283d1ee5e..5aa93b5ec722172b0d185eb5b512d052252ba49a 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp
>@@ -39,7 +39,7 @@ static const char* kCookieValueNew = "new-value";
> 
> static const char* kIndexHtmlFormat =
>     "<html><body>"
>-    " <p>WebKitGTK+ Cookie Manager test</p>"
>+    " <p>WebKitGTK Cookie Manager test</p>"
>     " <img src='http://localhost:%u/image.png' width=5 height=5></img>"
>     "</body></html>";
> 
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp
>index 53d325e549d279b8d656611910c029f254005bc6..84131c854dfc52081382b12e5357cb9a5eb3efc4 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp
>@@ -31,7 +31,7 @@ static const char* kIndexHtml =
>     "<html><head>"
>     " <link rel='stylesheet' href='/style.css' type='text/css'>"
>     " <script language='javascript' src='/javascript.js'></script>"
>-    "</head><body>WebKitGTK+ resources test</body></html>";
>+    "</head><body>WebKitGTK resources test</body></html>";
> 
> static const char* kStyleCSS =
>     "body {"
>@@ -216,7 +216,7 @@ static void testWebViewResources(ResourcesTest* test, gconstpointer)
>     g_assert_null(test->subresources());
> 
>     // Load simple page without subresources.
>-    test->loadHtml("<html><body>Testing WebKitGTK+</body></html>", 0);
>+    test->loadHtml("<html><body>Testing WebKitGTK</body></html>", 0);
>     test->waitUntilLoadFinished();
>     WebKitWebResource* resource = webkit_web_view_get_main_resource(test->m_webView);
>     g_assert_nonnull(resource);
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp
>index 414a35a7f0ef4b9f9f88dc543995e92f58d06879..9c4074c5911582d88a08d99992c3af29f1928598 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp
>@@ -24,11 +24,11 @@
> #include <wtf/glib/GRefPtr.h>
> #include <wtf/text/StringHash.h>
> 
>-static const char* kAlertDialogMessage = "WebKitGTK+ alert dialog message";
>-static const char* kConfirmDialogMessage = "WebKitGTK+ confirm dialog message";
>-static const char* kPromptDialogMessage = "WebKitGTK+ prompt dialog message";
>-static const char* kPromptDialogReturnedText = "WebKitGTK+ prompt dialog returned text";
>-static const char* kBeforeUnloadConfirmDialogMessage = "WebKitGTK+ beforeunload dialog message";
>+static const char* kAlertDialogMessage = "WebKitGTK alert dialog message";
>+static const char* kConfirmDialogMessage = "WebKitGTK confirm dialog message";
>+static const char* kPromptDialogMessage = "WebKitGTK prompt dialog message";
>+static const char* kPromptDialogReturnedText = "WebKitGTK prompt dialog returned text";
>+static const char* kBeforeUnloadConfirmDialogMessage = "WebKitGTK beforeunload dialog message";
> 
> class UIClientTest: public WebViewTest {
> public:
>@@ -686,9 +686,9 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
>         "    }"
>         " </script>"
>         "</head><body>"
>-        " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK+ Title'>WebKitGTK+ Website</a>"
>+        " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK Title'>WebKitGTK Website</a>"
>         " <img style='position:absolute; left:1; top:10' src='0xdeadbeef' width=5 height=5></img>"
>-        " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK+ Logo'><img src='0xdeadbeef' width=5 height=5></img></a>"
>+        " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK Logo'><img src='0xdeadbeef' width=5 height=5></img></a>"
>         " <input style='position:absolute; left:1; top:30' size='10'></input>"
>         " <video style='position:absolute; left:1; top:100' width='300' height='300' controls='controls' preload='none'><source src='movie.ogg' type='video/ogg' /></video>"
>         " <p style='position:absolute; left:1; top:120' id='text_to_select'>Lorem ipsum.</p>"
>@@ -705,8 +705,8 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
>     g_assert_false(webkit_hit_test_result_context_is_editable(hitTestResult));
>     g_assert_false(webkit_hit_test_result_context_is_selection(hitTestResult));
>     g_assert_cmpstr(webkit_hit_test_result_get_link_uri(hitTestResult), ==, "http://www.webkitgtk.org/");
>-    g_assert_cmpstr(webkit_hit_test_result_get_link_title(hitTestResult), ==, "WebKitGTK+ Title");
>-    g_assert_cmpstr(webkit_hit_test_result_get_link_label(hitTestResult), ==, "WebKitGTK+ Website");
>+    g_assert_cmpstr(webkit_hit_test_result_get_link_title(hitTestResult), ==, "WebKitGTK Title");
>+    g_assert_cmpstr(webkit_hit_test_result_get_link_label(hitTestResult), ==, "WebKitGTK Website");
>     g_assert_cmpuint(test->m_mouseTargetModifiers, ==, 0);
> 
>     // Move out of the link.
>@@ -739,7 +739,7 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
>     g_assert_false(webkit_hit_test_result_context_is_selection(hitTestResult));
>     g_assert_cmpstr(webkit_hit_test_result_get_link_uri(hitTestResult), ==, "http://www.webkitgtk.org/logo");
>     g_assert_cmpstr(webkit_hit_test_result_get_image_uri(hitTestResult), ==, "file:///0xdeadbeef");
>-    g_assert_cmpstr(webkit_hit_test_result_get_link_title(hitTestResult), ==, "WebKitGTK+ Logo");
>+    g_assert_cmpstr(webkit_hit_test_result_get_link_title(hitTestResult), ==, "WebKitGTK Logo");
>     g_assert_false(webkit_hit_test_result_get_link_label(hitTestResult));
>     g_assert_cmpuint(test->m_mouseTargetModifiers, ==, 0);
> 
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp
>index f8ea1886aa0679b38ce88065f16314020a309774..72bf7367d6176bfad200c4ee859e1cb1f26cb813 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp
>@@ -34,7 +34,7 @@ static GUniquePtr<char> scriptDialogResult;
> 
> static void testWebExtensionGetTitle(WebViewTest* test, gconstpointer)
> {
>-    test->loadHtml("<html><head><title>WebKitGTK+ Web Extensions Test</title></head><body></body></html>", 0);
>+    test->loadHtml("<html><head><title>WebKitGTK Web Extensions Test</title></head><body></body></html>", 0);
>     test->waitUntilLoadFinished();
> 
>     GUniquePtr<char> extensionBusName(g_strdup_printf("org.webkit.gtk.WebExtensionTest%u", Test::s_webExtensionID));
>@@ -50,7 +50,7 @@ static void testWebExtensionGetTitle(WebViewTest* test, gconstpointer)
> 
>     const char* title;
>     g_variant_get(result.get(), "(&s)", &title);
>-    g_assert_cmpstr(title, ==, "WebKitGTK+ Web Extensions Test");
>+    g_assert_cmpstr(title, ==, "WebKitGTK Web Extensions Test");
> }
> 
> #if PLATFORM(GTK)
>@@ -130,7 +130,7 @@ static void testDocumentLoadedSignal(WebViewTest* test, gconstpointer)
>         0);
>     g_assert_cmpuint(id, !=, 0);
> 
>-    test->loadHtml("<html><head><title>WebKitGTK+ Web Extensions Test</title></head><body></body></html>", 0);
>+    test->loadHtml("<html><head><title>WebKitGTK Web Extensions Test</title></head><body></body></html>", 0);
>     g_main_loop_run(test->m_mainLoop);
>     g_dbus_connection_signal_unsubscribe(connection, id);
> }
>@@ -308,7 +308,7 @@ static void testWebExtensionFormControlsAssociated(WebViewTest* test, gconstpoin
>         nullptr);
>     g_assert_cmpuint(id, !=, 0);
> 
>-    test->loadHtml("<!DOCTYPE html><head><title>WebKitGTK+ Web Extensions Test</title></head><div id=\"placeholder\"/>", 0);
>+    test->loadHtml("<!DOCTYPE html><head><title>WebKitGTK Web Extensions Test</title></head><div id=\"placeholder\"/>", 0);
>     test->waitUntilLoadFinished();
> 
>     static const char* addFormScript =
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
>index 5a4a7e4a424e48bb65ac8cbb09b68a17447b1242..84f9095576d76023aaef16f95806a36ab0c24af7 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
>@@ -417,12 +417,12 @@ static void testWebKitSettingsUserAgent(WebViewTest* test, gconstpointer)
>     g_assert_cmpstr(funkyUserAgent, ==, webkit_settings_get_user_agent(settings.get()));
>     assertThatUserAgentIsSentInHeaders(test, funkyUserAgent);
> 
>-    webkit_settings_set_user_agent_with_application_details(settings.get(), "WebKitGTK+", 0);
>+    webkit_settings_set_user_agent_with_application_details(settings.get(), "WebKitGTK", 0);
>     const char* userAgentWithNullVersion = webkit_settings_get_user_agent(settings.get());
>     g_assert_cmpstr(g_strstr_len(userAgentWithNullVersion, -1, defaultUserAgent.data()), ==, userAgentWithNullVersion);
>-    g_assert_nonnull(g_strstr_len(userAgentWithNullVersion, -1, "WebKitGTK+"));
>+    g_assert_nonnull(g_strstr_len(userAgentWithNullVersion, -1, "WebKitGTK"));
> 
>-    webkit_settings_set_user_agent_with_application_details(settings.get(), "WebKitGTK+", "");
>+    webkit_settings_set_user_agent_with_application_details(settings.get(), "WebKitGTK", "");
>     g_assert_cmpstr(webkit_settings_get_user_agent(settings.get()), ==, userAgentWithNullVersion);
> 
>     webkit_settings_set_user_agent_with_application_details(settings.get(), "WebCatGTK+", "3.4.5");
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
>index d0531b49f0fc36012ae3aa26d2973b54e54c4259..77f76172e92fd9a9065ae5ffb2f821ed67bbbd01 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
>@@ -297,7 +297,7 @@ static void testWebViewZoomLevel(WebViewTest* test, gconstpointer)
> 
> static void testWebViewRunJavaScript(WebViewTest* test, gconstpointer)
> {
>-    static const char* html = "<html><body><a id='WebKitLink' href='http://www.webkitgtk.org/' title='WebKitGTK+ Title'>WebKitGTK+ Website</a></body></html>";
>+    static const char* html = "<html><body><a id='WebKitLink' href='http://www.webkitgtk.org/' title='WebKitGTK Title'>WebKitGTK Website</a></body></html>";
>     test->loadHtml(html, 0);
>     test->waitUntilLoadFinished();
> 
>@@ -307,7 +307,7 @@ static void testWebViewRunJavaScript(WebViewTest* test, gconstpointer)
>     test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(webkit_javascript_result_get_js_value(javascriptResult)));
>     g_assert_no_error(error.get());
>     GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
>-    g_assert_cmpstr(valueString.get(), ==, "WebKitGTK+ Title");
>+    g_assert_cmpstr(valueString.get(), ==, "WebKitGTK Title");
> 
>     javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.getElementById('WebKitLink').href;", &error.outPtr());
>     g_assert_nonnull(javascriptResult);
>@@ -321,7 +321,7 @@ static void testWebViewRunJavaScript(WebViewTest* test, gconstpointer)
>     test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(webkit_javascript_result_get_js_value(javascriptResult)));
>     g_assert_no_error(error.get());
>     valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
>-    g_assert_cmpstr(valueString.get(), ==, "WebKitGTK+ Website");
>+    g_assert_cmpstr(valueString.get(), ==, "WebKitGTK Website");
> 
>     javascriptResult = test->runJavaScriptAndWaitUntilFinished("a = 25;", &error.outPtr());
>     g_assert_nonnull(javascriptResult);
>@@ -364,7 +364,7 @@ static void testWebViewRunJavaScript(WebViewTest* test, gconstpointer)
>     test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(webkit_javascript_result_get_js_value(javascriptResult)));
>     g_assert_no_error(error.get());
>     valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
>-    g_assert_cmpstr(valueString.get(), ==, "WebKitGTK+ Title");
>+    g_assert_cmpstr(valueString.get(), ==, "WebKitGTK Title");
> 
>     javascriptResult = test->runJavaScriptFromGResourceAndWaitUntilFinished("/wrong/path/to/resource.js", &error.outPtr());
>     g_assert_null(javascriptResult);
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp b/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp
>index ed23f1b03dae5132c2e225f08820fe8aa572198d..a693a8c63a4087d2343e34e90c74b16dfaee58a3 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp
>@@ -37,7 +37,7 @@ int main(int argc, char** argv)
>     WebKitWebView* webView = WEBKIT_WEB_VIEW(webkit_web_view_new());
>     webkit_settings_set_enable_developer_extras(webkit_web_view_get_settings(webView), TRUE);
>     webkit_web_view_load_html(webView,
>-        "<html><body><p>WebKitGTK+ Inspector Test Server</p></body></html>",
>+        "<html><body><p>WebKitGTK Inspector Test Server</p></body></html>",
>         "http://127.0.0.1:2999/");
> 
>     GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp
>index 502b5e6379dae2e252cb183b4608c00517d05d56..e88a3841ee470d195845e9fa38b895717e1a6209 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp
>@@ -437,9 +437,9 @@ static void prepareContextMenuTestView(ContextMenuDefaultTest* test)
>     GUniquePtr<char> baseDir(g_strdup_printf("file://%s/", Test::getResourcesDir().data()));
>     const char* linksHTML =
>         "<html><body>"
>-        " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK+ Title'>WebKitGTK+ Website</a>"
>+        " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK Title'>WebKitGTK Website</a>"
>         " <img style='position:absolute; left:1; top:10' src='blank.ico' width=5 height=5></img>"
>-        " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK+ Logo'><img src='blank.ico' width=5 height=5></img></a>"
>+        " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK Logo'><img src='blank.ico' width=5 height=5></img></a>"
>         " <input style='position:absolute; left:1; top:30' size='10'></input>"
>         " <video style='position:absolute; left:1; top:50' width='300' height='300' controls='controls' preload='none'><source src='silence.webm' type='video/webm' /></video>"
>         " <audio style='position:absolute; left:1; top:60' width='50' height='20' controls='controls' preload='none'><source src='track.ogg' type='audio/ogg' /></audio>"
>@@ -635,11 +635,11 @@ static void testContextMenuPopulateMenu(ContextMenuCustomTest* test, gconstpoint
> {
>     test->showInWindowAndWaitUntilMapped();
> 
>-    test->loadHtml("<html><body>WebKitGTK+ Context menu tests</body></html>", "file:///");
>+    test->loadHtml("<html><body>WebKitGTK Context menu tests</body></html>", "file:///");
>     test->waitUntilLoadFinished();
> 
>     // Create a custom menu item.
>-    GRefPtr<GtkAction> action = adoptGRef(gtk_action_new("WebKitGTK+CustomAction", "Custom _Action", nullptr, nullptr));
>+    GRefPtr<GtkAction> action = adoptGRef(gtk_action_new("WebKitGTKCustomAction", "Custom _Action", nullptr, nullptr));
>     test->setAction(action.get());
>     test->showContextMenuAndWaitUntilFinished();
>     test->activateCustomMenuItemAndWaitUntilActivated(gtk_action_get_label(action.get()));
>@@ -647,7 +647,7 @@ static void testContextMenuPopulateMenu(ContextMenuCustomTest* test, gconstpoint
>     g_assert_false(test->m_toggled);
> 
>     // Create a custom toggle menu item.
>-    GRefPtr<GtkAction> toggleAction = adoptGRef(GTK_ACTION(gtk_toggle_action_new("WebKitGTK+CustomToggleAction", "Custom _Toggle Action", nullptr, nullptr)));
>+    GRefPtr<GtkAction> toggleAction = adoptGRef(GTK_ACTION(gtk_toggle_action_new("WebKitGTKCustomToggleAction", "Custom _Toggle Action", nullptr, nullptr)));
>     test->setAction(toggleAction.get());
>     test->showContextMenuAndWaitUntilFinished();
>     test->toggleCustomMenuItemAndWaitUntilToggled(gtk_action_get_label(toggleAction.get()));
>@@ -655,7 +655,7 @@ static void testContextMenuPopulateMenu(ContextMenuCustomTest* test, gconstpoint
>     g_assert_true(test->m_toggled);
> 
>     // Create a custom menu item using GAction.
>-    GRefPtr<GAction> gAction = adoptGRef(G_ACTION(g_simple_action_new("WebKitGTK+CustomGAction", nullptr)));
>+    GRefPtr<GAction> gAction = adoptGRef(G_ACTION(g_simple_action_new("WebKitGTKCustomGAction", nullptr)));
>     test->setAction(gAction.get(), "Custom _GAction");
>     test->showContextMenuAndWaitUntilFinished();
>     test->activateCustomMenuItemAndWaitUntilActivated("Custom _GAction");
>@@ -663,7 +663,7 @@ static void testContextMenuPopulateMenu(ContextMenuCustomTest* test, gconstpoint
>     g_assert_false(test->m_toggled);
> 
>     // Create a custom toggle menu item using GAction.
>-    GRefPtr<GAction> toggleGAction = adoptGRef(G_ACTION(g_simple_action_new_stateful("WebKitGTK+CustomToggleGAction", nullptr, g_variant_new_boolean(FALSE))));
>+    GRefPtr<GAction> toggleGAction = adoptGRef(G_ACTION(g_simple_action_new_stateful("WebKitGTKCustomToggleGAction", nullptr, g_variant_new_boolean(FALSE))));
>     test->setAction(toggleGAction.get(), "Custom _Toggle GAction");
>     test->showContextMenuAndWaitUntilFinished();
>     test->toggleCustomMenuItemAndWaitUntilToggled("Custom _Toggle GAction");
>@@ -671,8 +671,8 @@ static void testContextMenuPopulateMenu(ContextMenuCustomTest* test, gconstpoint
>     g_assert_true(test->m_toggled);
> 
>     // Create a custom menu item using GAction with a target.
>-    gAction = adoptGRef(G_ACTION(g_simple_action_new("WebKitGTK+CustomGActionWithTarget", G_VARIANT_TYPE_STRING)));
>-    test->setAction(gAction.get(), "Custom _GAction With Target", g_variant_new_string("WebKitGTK+CustomGActionTarget"));
>+    gAction = adoptGRef(G_ACTION(g_simple_action_new("WebKitGTKCustomGActionWithTarget", G_VARIANT_TYPE_STRING)));
>+    test->setAction(gAction.get(), "Custom _GAction With Target", g_variant_new_string("WebKitGTKCustomGActionTarget"));
>     test->showContextMenuAndWaitUntilFinished();
>     test->activateCustomMenuItemAndWaitUntilActivated("Custom _GAction With Target");
>     g_assert_true(test->m_activated);
>@@ -695,17 +695,17 @@ public:
> 
>         // Add custom actions.
>         G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
>-        GRefPtr<GtkAction> action = adoptGRef(gtk_action_new("WebKitGTK+CustomAction", "Custom _Action", nullptr, nullptr));
>+        GRefPtr<GtkAction> action = adoptGRef(gtk_action_new("WebKitGTKCustomAction", "Custom _Action", nullptr, nullptr));
>         gtk_action_set_sensitive(action.get(), FALSE);
>         webkit_context_menu_insert(contextMenu, webkit_context_menu_item_new(action.get()), -1);
>-        GRefPtr<GtkAction> toggleAction = adoptGRef(GTK_ACTION(gtk_toggle_action_new("WebKitGTK+CustomToggleAction", "Custom _Toggle Action", nullptr, nullptr)));
>+        GRefPtr<GtkAction> toggleAction = adoptGRef(GTK_ACTION(gtk_toggle_action_new("WebKitGTKCustomToggleAction", "Custom _Toggle Action", nullptr, nullptr)));
>         gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(toggleAction.get()), TRUE);
>         webkit_context_menu_append(contextMenu, webkit_context_menu_item_new(toggleAction.get()));
>         webkit_context_menu_append(contextMenu, webkit_context_menu_item_new_separator());
>-        GRefPtr<GAction> gAction = adoptGRef(G_ACTION(g_simple_action_new("WebKitGTK+CustomGAction", nullptr)));
>+        GRefPtr<GAction> gAction = adoptGRef(G_ACTION(g_simple_action_new("WebKitGTKCustomGAction", nullptr)));
>         g_simple_action_set_enabled(G_SIMPLE_ACTION(gAction.get()), FALSE);
>         webkit_context_menu_insert(contextMenu, webkit_context_menu_item_new_from_gaction(gAction.get(), "Custom _GAction", nullptr), -1);
>-        GRefPtr<GAction> toggleGAction = adoptGRef(G_ACTION(g_simple_action_new_stateful("WebKitGTK+CustomToggleGAction", nullptr, g_variant_new_boolean(TRUE))));
>+        GRefPtr<GAction> toggleGAction = adoptGRef(G_ACTION(g_simple_action_new_stateful("WebKitGTKCustomToggleGAction", nullptr, g_variant_new_boolean(TRUE))));
>         webkit_context_menu_append(contextMenu, webkit_context_menu_item_new_from_gaction(toggleGAction.get(), "Custom T_oggle GAction", nullptr));
>         webkit_context_menu_append(contextMenu, webkit_context_menu_item_new_separator());
>         G_GNUC_END_IGNORE_DEPRECATIONS;
>@@ -756,7 +756,7 @@ static void testContextMenuCustomMenu(ContextMenuCustomFullTest* test, gconstpoi
> {
>     test->showInWindowAndWaitUntilMapped();
> 
>-    test->loadHtml("<html><body>WebKitGTK+ Context menu tests</body></html>", "file:///");
>+    test->loadHtml("<html><body>WebKitGTK Context menu tests</body></html>", "file:///");
>     test->waitUntilLoadFinished();
> 
>     test->showContextMenuAndWaitUntilFinished();
>@@ -810,7 +810,7 @@ static void testContextMenuDisableMenu(ContextMenuDisabledTest* test, gconstpoin
> {
>     test->showInWindowAndWaitUntilMapped();
> 
>-    test->loadHtml("<html><body>WebKitGTK+ Context menu tests</body></html>", "file:///");
>+    test->loadHtml("<html><body>WebKitGTK Context menu tests</body></html>", "file:///");
>     test->waitUntilLoadFinished();
> 
>     test->m_disableMode = ContextMenuDisabledTest::IgnoreDefaultMenu;
>@@ -863,7 +863,7 @@ static void testContextMenuSubMenu(ContextMenuSubmenuTest* test, gconstpointer)
> {
>     test->showInWindowAndWaitUntilMapped();
> 
>-    test->loadHtml("<html><body>WebKitGTK+ Context menu tests</body></html>", "file:///");
>+    test->loadHtml("<html><body>WebKitGTK Context menu tests</body></html>", "file:///");
>     test->waitUntilLoadFinished();
> 
>     test->showContextMenuAndWaitUntilFinished();
>@@ -904,7 +904,7 @@ static void testContextMenuDismissed(ContextMenuDismissedTest* test, gconstpoint
> {
>     test->showInWindowAndWaitUntilMapped();
> 
>-    test->loadHtml("<html><body>WebKitGTK+ Context menu tests</body></html>", "file:///");
>+    test->loadHtml("<html><body>WebKitGTK Context menu tests</body></html>", "file:///");
>     test->waitUntilLoadFinished();
> 
>     test->showContextMenuAndWaitUntilDismissed();
>@@ -953,8 +953,8 @@ public:
> static void testContextMenuWebExtensionMenu(ContextMenuWebExtensionTest* test, gconstpointer)
> {
>     test->showInWindowAndWaitUntilMapped();
>-    test->loadHtml("<html><body>WebKitGTK+ Context menu tests<br>"
>-        "<a style='position:absolute; left:1; top:10' href='http://www.webkitgtk.org'>WebKitGTK+ Website</a></body></html>",
>+    test->loadHtml("<html><body>WebKitGTK Context menu tests<br>"
>+        "<a style='position:absolute; left:1; top:10' href='http://www.webkitgtk.org'>WebKitGTK Website</a></body></html>",
>         "ContextMenuTestDefault");
>     test->waitUntilLoadFinished();
> 
>@@ -1043,28 +1043,28 @@ public:
> static void testContextMenuWebExtensionNode(ContextMenuWebExtensionNodeTest* test, gconstpointer)
> {
>     test->showInWindowAndWaitUntilMapped();
>-    test->loadHtml("<html><body><p style='position:absolute; left:1; top:1'>WebKitGTK+ Context menu tests</p><br>"
>-        "<a style='position:absolute; left:1; top:100' href='http://www.webkitgtk.org'>WebKitGTK+ Website</a></body></html>",
>+    test->loadHtml("<html><body><p style='position:absolute; left:1; top:1'>WebKitGTK Context menu tests</p><br>"
>+        "<a style='position:absolute; left:1; top:100' href='http://www.webkitgtk.org'>WebKitGTK Website</a></body></html>",
>         "ContextMenuTestNode");
>     test->waitUntilLoadFinished();
> 
>     test->showContextMenuAtPositionAndWaitUntilFinished(0, 0);
>     g_assert_cmpstr(test->m_node.name.data(), ==, "HTML");
>     g_assert_cmpuint(test->m_node.type, ==, ContextMenuWebExtensionNodeTest::Node::NodeElement);
>-    g_assert_cmpstr(test->m_node.contents.data(), ==, "WebKitGTK+ Context menu testsWebKitGTK+ Website");
>+    g_assert_cmpstr(test->m_node.contents.data(), ==, "WebKitGTK Context menu testsWebKitGTK Website");
>     g_assert_cmpstr(test->m_node.parentName.data(), ==, "#document");
> 
>     test->showContextMenuAtPositionAndWaitUntilFinished(1, 20);
>     g_assert_cmpstr(test->m_node.name.data(), ==, "#text");
>     g_assert_cmpuint(test->m_node.type, ==, ContextMenuWebExtensionNodeTest::Node::NodeText);
>-    g_assert_cmpstr(test->m_node.contents.data(), ==, "WebKitGTK+ Context menu tests");
>+    g_assert_cmpstr(test->m_node.contents.data(), ==, "WebKitGTK Context menu tests");
>     g_assert_cmpstr(test->m_node.parentName.data(), ==, "P");
> 
>     // Link menu.
>     test->showContextMenuAtPositionAndWaitUntilFinished(1, 101);
>     g_assert_cmpstr(test->m_node.name.data(), ==, "#text");
>     g_assert_cmpuint(test->m_node.type, ==, ContextMenuWebExtensionNodeTest::Node::NodeText);
>-    g_assert_cmpstr(test->m_node.contents.data(), ==, "WebKitGTK+ Website");
>+    g_assert_cmpstr(test->m_node.contents.data(), ==, "WebKitGTK Website");
>     g_assert_cmpstr(test->m_node.parentName.data(), ==, "A");
> }
> 
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp
>index 133b24e3c8b0c139dd3f148d2a4ea080d1e42bf6..ef1b2b56f4f1f6ea78e7d90cc6bbb45ba9a2d9d9 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp
>@@ -169,7 +169,7 @@ static void testInspectorDefault(InspectorTest* test, gconstpointer)
> {
>     test->showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
>     test->resizeView(200, 200);
>-    test->loadHtml("<html><body><p>WebKitGTK+ Inspector test</p></body></html>", 0);
>+    test->loadHtml("<html><body><p>WebKitGTK Inspector test</p></body></html>", 0);
>     test->waitUntilLoadFinished();
> 
>     test->show();
>@@ -300,7 +300,7 @@ static void testInspectorManualAttachDetach(CustomInspectorTest* test, gconstpoi
> {
>     test->showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
>     test->resizeView(200, 200);
>-    test->loadHtml("<html><body><p>WebKitGTK+ Inspector test</p></body></html>", 0);
>+    test->loadHtml("<html><body><p>WebKitGTK Inspector test</p></body></html>", 0);
>     test->waitUntilLoadFinished();
> 
>     test->show();
>@@ -342,7 +342,7 @@ static void testInspectorCustomContainerDestroyed(CustomInspectorTest* test, gco
> {
>     test->showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
>     test->resizeView(200, 200);
>-    test->loadHtml("<html><body><p>WebKitGTK+ Inspector test</p></body></html>", 0);
>+    test->loadHtml("<html><body><p>WebKitGTK Inspector test</p></body></html>", 0);
>     test->waitUntilLoadFinished();
> 
>     test->show();
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp
>index 122bf969fa801108e77edaaa7d5e938c94a99f3b..2520c8201169065178195760d0eac2c2ea0a1a26 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp
>@@ -65,7 +65,7 @@ static gboolean webViewPrintCallback(WebKitWebView* webView, WebKitPrintOperatio
> static void testWebViewPrint(WebViewTest* test, gconstpointer)
> {
>     g_signal_connect(test->m_webView, "print", G_CALLBACK(webViewPrintCallback), test);
>-    test->loadHtml("<html><body onLoad=\"print();\">WebKitGTK+ printing test</body></html>", 0);
>+    test->loadHtml("<html><body onLoad=\"print();\">WebKitGTK printing test</body></html>", 0);
>     g_main_loop_run(test->m_mainLoop);
> }
> 
>@@ -123,7 +123,7 @@ public:
> 
> static void testPrintOperationPrint(PrintTest* test, gconstpointer)
> {
>-    test->loadHtml("<html><body>WebKitGTK+ printing test</body></html>", 0);
>+    test->loadHtml("<html><body>WebKitGTK printing test</body></html>", 0);
>     test->waitUntilLoadFinished();
> 
>     GRefPtr<GtkPrinter> printer = adoptGRef(findPrintToFilePrinter());
>@@ -156,7 +156,7 @@ static void testPrintOperationPrint(PrintTest* test, gconstpointer)
> 
> static void testPrintOperationErrors(PrintTest* test, gconstpointer)
> {
>-    test->loadHtml("<html><body>WebKitGTK+ printing errors test</body></html>", 0);
>+    test->loadHtml("<html><body>WebKitGTK printing errors test</body></html>", 0);
>     test->waitUntilLoadFinished();
> 
>     GRefPtr<GtkPrinter> printer = adoptGRef(findPrintToFilePrinter());
>diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies
>index f43c1ca99566b0c2bec0528579189efe4f608c0a..43db52184a7f91f9ff5ef60f0923591a77feaa69 100755
>--- a/Tools/gtk/install-dependencies
>+++ b/Tools/gtk/install-dependencies
>@@ -85,7 +85,7 @@ function aptIfElse {
> }
> 
> function installDependenciesWithApt {
>-    # These are dependencies necessary for building WebKitGTK+.
>+    # These are dependencies necessary for building WebKitGTK.
>     packages=" \
>         autoconf \
>         automake \
>@@ -238,7 +238,7 @@ function installDependenciesWithApt {
> }
> 
> function installDependenciesWithPacman {
>-    # These are dependencies necessary for building WebKitGTK+.
>+    # These are dependencies necessary for building WebKitGTK.
>     packages=" \
>         alsa-lib \
>         autoconf \
>@@ -405,7 +405,7 @@ call python2 in the WebKit folder:
> 
>     https://wiki.archlinux.org/index.php/Python#Dealing_with_version_problem_in_build_scripts
> 
>-Alternatively, you may use a Python 2.x virtualenv while hacking on WebKitGTK+:
>+Alternatively, you may use a Python 2.x virtualenv while hacking on WebKitGTK:
> 
>     https://wiki.archlinux.org/index.php/Python/Virtual_environment
> 
>@@ -413,7 +413,7 @@ EOF
> }
> 
> function installDependenciesWithDnf {
>-    # These are dependencies necessary for building WebKitGTK+.
>+    # These are dependencies necessary for building WebKitGTK.
>     packages=" \
>         atk-devel \
>         alsa-lib-devel \
>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index 15609f86c72c5d01c0a533a229bff1138486acd4..eb60744121a6d7e0014ff35684f45a403cebfa97 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -120,7 +120,7 @@
>   
>+              for WebKitGTK above 4.9 -->
>   <autotools id="pixman" autogen-sh="configure"
>              autogenargs="--enable-gtk=no --disable-arm-iwmmxt">
>     <branch module="releases/pixman-0.34.0.tar.gz" version="0.34.0"
>diff --git a/Tools/gtkdoc/generate-gtkdoc b/Tools/gtkdoc/generate-gtkdoc
>index 37ccacc774c22c8f03e0b2410cd444d175fd2ee0..7a06d494ec9dcca5bccebaf00985a42cbaf97d24 100755
>--- a/Tools/gtkdoc/generate-gtkdoc
>+++ b/Tools/gtkdoc/generate-gtkdoc
>@@ -239,7 +239,7 @@ if __name__ == "__main__":
>                              'make install as DESTDIR.')
> 
>     parser.add_argument('--gtk', action='store_true',
>-                        help='Build documentation for WebKitGTK+')
>+                        help='Build documentation for WebKitGTK')
>     parser.add_argument('--wpe', action='store_true',
>                         help='Build documentation for WPE')
> 
>diff --git a/Tools/wpe/install-dependencies b/Tools/wpe/install-dependencies
>index 1280b3ba506433a1f4feb3e6fcfeb3397b6e2f12..08694ae818d21b76fbe1f223bf9521c89689627c 100755
>--- a/Tools/wpe/install-dependencies
>+++ b/Tools/wpe/install-dependencies
>@@ -253,7 +253,7 @@ call python2 in the WebKit folder:
> 
>     https://wiki.archlinux.org/index.php/Python#Dealing_with_version_problem_in_build_scripts
> 
>-Alternatively, you may use a Python 2.x virtualenv while hacking on WebKitGTK+:
>+Alternatively, you may use a Python 2.x virtualenv while hacking on WPE:
> 
>     https://wiki.archlinux.org/index.php/Python/Virtual_environment
> 
>diff --git a/ChangeLog b/ChangeLog
>index fcefebb7b070d43eacb8cce13a753bbced12021c..f27ebc0d9411bea57d59b8498d4fc2d482c57fca 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-24  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
>+        https://bugs.webkit.org/show_bug.cgi?id=199159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/FindGLIB.cmake:
>+
> 2019-06-21  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] Bump minimum versions of GLib, GTK, libsoup, ATK, GStreamer, and Cairo

Flags:

cgarcia: review+
cgarcia: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 199159: 372760