Attachment 362037 Details for Bug 194658 – Patch

[patch] Patch

bug-194658-20190214125023.patch (text/plain), 6.30 KB, created by Michael Catanzaro on 2019-02-14 10:50:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-02-14 10:50:24 PST

Size: 6.30 KB

patch

obsolete

>Subversion Revision: 241552
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index bd574b8b7d7b0ab83598a46d2fea6331255151fb..df28adcc61dee664bd25ac70c78d9882f8ac6902 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-02-14  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GTK] WebKitGTK+ -> WebKitGTK
>+        https://bugs.webkit.org/show_bug.cgi?id=194658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This renames WebKitGTK+ to WebKitGTK in a few user-visible places: the API documentation,
>+        the pkg-config, and an error message.
>+
>+        In a couple places where it's exposed in WPE documentation, WPE is now mentioned, or the
>+        reference to "WebKitGTK+" is changed to just "WebKit."
>+
>+        * UIProcess/API/glib/WebKitSettings.cpp:
>+        (webkit_settings_class_init):
>+        * UIProcess/API/glib/WebKitWebView.cpp:
>+        * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml:
>+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPrivateGtk.h:
>+        * gtk/webkit2gtk-web-extension.pc.in:
>+        * gtk/webkit2gtk.pc.in:
>+
> 2019-02-14  Chris Fleizach  <cfleizach@apple.com>
> 
>         AX: ARIA Reflection was disabled in error
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
>index 5133b464f5d575d475117d3791ce8b2d241f5036..03654dd0481eb7f357eca537f69813eb2803349b 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
>@@ -1247,7 +1247,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
>      * WebKitSettings:enable-accelerated-2d-canvas:
>      *
>      * Enable or disable accelerated 2D canvas. Accelerated 2D canvas is only available
>-     * if WebKitGTK+ was compiled with a version of Cairo including the unstable CairoGL API.
>+     * if WebKit was compiled with a version of Cairo including the unstable CairoGL API.
>      * When accelerated 2D canvas is enabled, WebKit may render some 2D canvas content
>      * using hardware accelerated drawing operations.
>      *
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>index e413fba3e474af7d24d8c460b2e167bb108fcec9..87d022d3cb56b484c8f543e2d55043550f04d14e 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>@@ -100,17 +100,17 @@ using namespace WebCore;
> 
> /**
>  * SECTION: WebKitWebView
>- * @Short_description: The central class of the WebKit2GTK+ API
>+ * @Short_description: The central class of the WPE WebKit and WebKitGTK APIs
>  * @Title: WebKitWebView
>  *
>- * #WebKitWebView is the central class of the WebKit2GTK+ API. It is
>- * responsible for managing the drawing of the content and forwarding
>- * of events. You can load any URI into the #WebKitWebView or a data
>- * string. With #WebKitSettings you can control various aspects of the
>- * rendering and loading of the content.
>+ * #WebKitWebView is the central class of the WPE WebKit and WebKitGTK
>+ * APIs. It is responsible for managing the drawing of the content and
>+ * forwarding of events. You can load any URI into the #WebKitWebView or
>+ * a data string. With #WebKitSettings you can control various aspects
>+ * of the rendering and loading of the content.
>  *
>- * Note that #WebKitWebView is scrollable by itself, so you don't need
>- * to embed it in a #GtkScrolledWindow.
>+ * Note that in WebKitGTK, #WebKitWebView is scrollable by itself, so
>+ * you don't need to embed it in a #GtkScrolledWindow.
>  */
> 
> enum {
>diff --git a/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml b/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
>index f18b3fd8c3aaa28a15a9109828f8b651fff9fc2a..dcb61630fe7352371276532214b48802b92e9ebf 100644
>--- a/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
>+++ b/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
>@@ -5,8 +5,8 @@
> ]>
> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
>   <bookinfo>
>-    <title>WebKit2GTK+ Reference Manual</title>
>-    <releaseinfo>for WebKit2GTK+ &version;</releaseinfo>
>+    <title>WebKitGTK Reference Manual</title>
>+    <releaseinfo>for WebKitGTK &version;</releaseinfo>
>   </bookinfo>
> 
>   <chapter>
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPrivateGtk.h b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPrivateGtk.h
>index 17d679c56db3828aa7590de362a8ef3268420f02..94630f04e4d75f087ade9a5cb0d4b76140c07dc4 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPrivateGtk.h
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPrivateGtk.h
>@@ -25,7 +25,7 @@
> 
> #include "webkitdomdefines.h"
> 
>-#define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK+ was not compiled with support for " Feature);
>+#define WEBKIT_WARN_FEATURE_NOT_PRESENT(Feature) g_warning("WebKitGTK was not compiled with support for " Feature);
> 
> namespace WebCore {
> class Node;
>diff --git a/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in b/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
>index aaef079877be1d22a85d819258c61a3971802983..2e7e9d5affd46583541ada42bd8605253d9a2254 100644
>--- a/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
>+++ b/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
>@@ -3,8 +3,8 @@ exec_prefix=${prefix}
> libdir=@LIB_INSTALL_DIR@
> includedir=${prefix}/include
> 
>-Name: WebKitGTK+ Web process extensions
>-Description: Web content engine for GTK+ - Web process extensions
>+Name: WebKitGTK web process extensions
>+Description: Web content engine for GTK - web process extensions
> URL: https://webkitgtk.org
> Version: @PROJECT_VERSION@
> Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
>diff --git a/Source/WebKit/gtk/webkit2gtk.pc.in b/Source/WebKit/gtk/webkit2gtk.pc.in
>index 5a15bbf36f2b9fb132cf6695647273c1279cbb76..1ccb6589aee1441b1fd7b72620368fcfa1a86314 100644
>--- a/Source/WebKit/gtk/webkit2gtk.pc.in
>+++ b/Source/WebKit/gtk/webkit2gtk.pc.in
>@@ -3,8 +3,8 @@ exec_prefix=${prefix}
> libdir=@LIB_INSTALL_DIR@
> includedir=${prefix}/include
> 
>-Name: WebKitGTK+
>-Description: Web content engine for GTK+
>+Name: WebKitGTK
>+Description: Web content engine for GTK
> URL: https://webkitgtk.org
> Version: @PROJECT_VERSION@
> Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@

Actions: View | Formatted Diff | Diff

Attachments on bug 194658: 362037