Fully rename WebKitGTK+ -> WebKitGTK everywhere
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Jun 2019 14:56:39 +0000 (14:56 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Jun 2019 14:56:39 +0000 (14:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=199159

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/FindGLIB.cmake:

Source/WebCore:

* 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):

Source/WebKit:

* UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:

Source/WTF:

* wtf/URLParser.cpp:
(WTF::URLParser::internationalDomainNameTranscoder):

Tools:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246790 268f45cc-cd09-0410-ab3c-d52691b4dbfc

32 files changed:
ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/URLParser.cpp
Source/WebCore/ChangeLog
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
Source/WebCore/platform/UserAgentQuirks.cpp
Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
Source/WebCore/rendering/RenderThemeGtk.cpp
Source/WebKit/ChangeLog
Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
Source/cmake/FindGLIB.cmake
Tools/BuildSlaveSupport/gtk/README
Tools/ChangeLog
Tools/MiniBrowser/gtk/BrowserWindow.c
Tools/MiniBrowser/gtk/main.c
Tools/Scripts/webkitpy/common/config/contributionareas.py
Tools/Scripts/webkitpy/common/config/contributors.json
Tools/Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py
Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp
Tools/TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp
Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp
Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp
Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp
Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp
Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp
Tools/TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp
Tools/gtk/install-dependencies
Tools/gtk/jhbuild.modules
Tools/gtkdoc/generate-gtkdoc
Tools/wpe/install-dependencies

index d1a938f..e44f9ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=199159
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/FindGLIB.cmake:
+
+2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         Require GCC 7
         https://bugs.webkit.org/show_bug.cgi?id=198914
 
index 41a6528..6f66c33 100644 (file)
@@ -1,5 +1,15 @@
 2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=199159
+
+        Reviewed by Carlos Garcia Campos.
+
+        * wtf/URLParser.cpp:
+        (WTF::URLParser::internationalDomainNameTranscoder):
+
+2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         Require GCC 7
         https://bugs.webkit.org/show_bug.cgi?id=198914
 
index b9cbec0..cdfc0f8 100644 (file)
@@ -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);
index 88f7a73..91c866b 100644 (file)
@@ -1,3 +1,19 @@
+2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=199159
+
+        Reviewed by Carlos Garcia Campos.
+
+        * 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-25  Rob Buis  <rbuis@igalia.com>
 
         Introduce LinkLoadParameters
index 084e2f6..3f091d1 100644 (file)
@@ -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:
index 5df5769..3584918 100644 (file)
@@ -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;
index f6641ef..053f6b9 100644 (file)
@@ -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);
index 04487dd..6dc19ca 100644 (file)
@@ -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();
index 4e8cb65..4c8fee3 100644 (file)
@@ -1,3 +1,12 @@
+2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=199159
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:
+
 2019-06-24  Brady Eidson  <beidson@apple.com>
 
         Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
index d572c54..252583c 100644 (file)
@@ -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()
 {
index 93d3ec5..71c982c 100644 (file)
@@ -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 ()
index 16fa9e7..f9f89f9 100644 (file)
@@ -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.
index 44ef1c9..df3c5cd 100644 (file)
@@ -1,3 +1,54 @@
+2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Fully rename WebKitGTK+ -> WebKitGTK everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=199159
+
+        Reviewed by Carlos Garcia Campos.
+
+        * 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>
 
         contributors.json not canonicalized since r243297
index 7fb3abd..be36989 100644 (file)
@@ -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;
index 9bb44bd..db81e15 100644 (file)
@@ -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());
index 6764e2c..f3c7ecf 100644 (file)
@@ -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']),
index 1559513..205179a 100644 (file)
          "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__"
       ],
          "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"
       ]
          "tanty0@gmail.com",
          "agomez@gnome.org"
       ],
-      "expertise" : "WebKitGTK+",
+      "expertise" : "WebKitGTK",
       "nicks" : [
          "tanty",
          "agomez"
       "emails" : [
          "wingo@igalia.com"
       ],
-      "expertise" : "JavaScriptCore, the WebKitGTK+ port",
+      "expertise" : "JavaScriptCore, the WebKitGTK port",
       "nicks" : [
          "wingo"
       ]
       "emails" : [
          "a.obzhirov@samsung.com"
       ],
-      "expertise" : "The WebKitGTK+ Port",
+      "expertise" : "The WebKitGTK Port",
       "nicks" : [
          "aobzhirov"
       ]
          "otte@gnome.org",
          "otte@webkit.org"
       ],
-      "expertise" : "WebKitGTK+ port, GTK+ lead developer",
+      "expertise" : "WebKitGTK port, GTK lead developer",
       "nicks" : [
          "otte"
       ]
          "self@brendanlong.com",
          "b.long@cablelabs.com"
       ],
-      "expertise" : "WebKitGTK+, GStreamer",
+      "expertise" : "WebKitGTK, GStreamer",
       "nicks" : [
          "brendanlong"
       ]
       "emails" : [
          "brian.holt@samsung.com"
       ],
-      "expertise" : "WebKitGTK+, memory leak detection",
+      "expertise" : "WebKitGTK, memory leak detection",
       "nicks" : [
          "bdholt1"
       ]
       "emails" : [
          "clopez@igalia.com"
       ],
-      "expertise" : "The WebKitGTK+ port, Tools, Build/test infrastructure",
+      "expertise" : "The WebKitGTK port, Tools, Build/test infrastructure",
       "nicks" : [
          "clopez"
       ]
          "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"
       ],
       "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"
       ]
       "emails" : [
          "csaavedra@igalia.com"
       ],
-      "expertise" : "WebKitGTK+ port, Epiphany developer, HTML Editing",
+      "expertise" : "WebKitGTK port, Epiphany developer, HTML Editing",
       "nicks" : [
          "claudio___"
       ],
       "emails" : [
          "d.nomiyama@samsung.com"
       ],
-      "expertise" : "The WebKitGTK+ Port",
+      "expertise" : "The WebKitGTK Port",
       "nicks" : [
          "dnomi"
       ]
          "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"
       ],
          "yoon@webkit.org",
          "ryumiel@company100.net"
       ],
-      "expertise" : "Accelerated Compositing, WebKitGTK+",
+      "expertise" : "Accelerated Compositing, WebKitGTK",
       "nicks" : [
          "ryumiel"
       ]
          "zecke@selfish.org",
          "zecke@webkit.org"
       ],
-      "expertise" : "The QtWebKit Port, The GTK+ WebKit Port",
+      "expertise" : "The QtWebKit Port, The WebKitGTK Port",
       "nicks" : [
          "zecke"
       ]
       "emails" : [
          "jdiggs@igalia.com"
       ],
-      "expertise" : "Accessibility, WebKitGTK+",
+      "expertise" : "Accessibility, WebKitGTK",
       "nicks" : [
          "joanie"
       ],
          "joone.hur@intel.com",
          "joone.hur@collabora.co.uk"
       ],
-      "expertise" : "The WebKitGtk+ port",
+      "expertise" : "The WebKitGTK port",
       "nicks" : [
          "joone"
       ]
       "emails" : [
          "rego@igalia.com"
       ],
-      "expertise" : "Layout, CSS, Selection, WebKitGTK+ port",
+      "expertise" : "Layout, CSS, Selection, WebKitGTK port",
       "nicks" : [
          "rego",
          "mrego"
          "mario.prada@samsung.com",
          "msanchez@igalia.com"
       ],
-      "expertise" : "WebKitGTK+, Accessibility, WebKit2, Epiphany/WebKit Contributor",
+      "expertise" : "WebKitGTK, Accessibility, WebKit2, Epiphany/WebKit Contributor",
       "nicks" : [
          "msanchez"
       ],
          "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"
       ]
          "mcatanzaro@igalia.com",
          "mcatanzaro@gnome.org"
       ],
-      "expertise" : "The WebKitGTK+ Port, Epiphany, Soup HTTP Backend",
+      "expertise" : "The WebKitGTK Port, Epiphany, Soup HTTP Backend",
       "nicks" : [
          "mcatanzaro"
       ],
       "emails" : [
          "magomez@igalia.com"
       ],
-      "expertise" : "The WebKitGTK+ port, Accelerated Compositing, HW acceleration",
+      "expertise" : "The WebKitGTK port, Accelerated Compositing, HW acceleration",
       "nicks" : [
          "magomez"
       ],
          "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"
       ],
          "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"
       ]
          "svillar@igalia.com",
          "sergio@webkit.org"
       ],
-      "expertise" : "WebKitGTK+ port, WebKit2, CSS Grid Layout, libsoup",
+      "expertise" : "WebKitGTK port, WebKit2, CSS Grid Layout, libsoup",
       "nicks" : [
          "svillar"
       ],
          "sheriff-bot"
       ]
    },
-   "WebKitGTK+ Bugs" : {
+   "WebKitGTK Bugs" : {
       "class" : "bot",
       "emails" : [
          "bugs-noreply@webkitgtk.org"
          "calvaris@igalia.com",
          "xrcalvar@igalia.com"
       ],
-      "expertise" : "WebKitGTK+, GStreamer, Streams API",
+      "expertise" : "WebKitGTK, GStreamer, Streams API",
       "nicks" : [
          "calvaris"
       ],
          "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"
       ],
index 4f870ce..359c85f 100644 (file)
@@ -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':
index dd69b4a..5aa93b5 100644 (file)
@@ -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>";
 
index 53d325e..84131c8 100644 (file)
@@ -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);
index 414a35a..9c4074c 100644 (file)
 #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);
 
index f8ea188..72bf736 100644 (file)
@@ -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 =
index 5a4a7e4..84f9095 100644 (file)
@@ -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");
index d0531b4..77f7617 100644 (file)
@@ -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);
index ed23f1b..a693a8c 100644 (file)
@@ -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);
index 502b5e6..e88a384 100644 (file)
@@ -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");
 }
 
index 133b24e..ef1b2b5 100644 (file)
@@ -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();
index 122bf96..2520c82 100644 (file)
@@ -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());
index f43c1ca..43db521 100755 (executable)
@@ -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 \
index 15609f8..eb60744 100644 (file)
   <!-- FIXME: Pixman 0.32.6 ARM iwMMXt fast path isn't buildable with GCC 4.9 and
               ARM traditional instruction set. It causes a build failure on Raspbian.
               This workaround can be removed once we raise the minimum GCC version
-              for WebKitGTK+ above 4.9 -->
+              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"
index 37ccacc..7a06d49 100755 (executable)
@@ -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')
 
index 1280b3b..08694ae 100755 (executable)
@@ -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