Attachment 343705 Details for Bug 187089 – Patch

[patch] Patch

bug-187089-20180627184246.patch (text/plain), 3.56 KB, created by Yusuke Suzuki on 2018-06-27 02:42:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2018-06-27 02:42:47 PDT

Size: 3.56 KB

patch

obsolete

>Subversion Revision: 233249
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c569ac89ed3627c914bbaa43707d0c9ac7a5b907..51b201ef18b570b841b8d646fd6b127b6d4b48d7 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-27  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        [GTK][WPE] Use LazyNeverDestroyed<XErrorTrapper> to remove static initializers
>+        https://bugs.webkit.org/show_bug.cgi?id=187089
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not allow copying since XErrorTrapper's logic relies on the address of XErrorTrapper.
>+
>+        * platform/graphics/x11/XErrorTrapper.h:
>+
> 2018-06-27  Tomas Popela  <tpopela@redhat.com>
> 
>         [GStreamer] Coverity scan issues
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ee3b41443ec370b58d24d48bb013cb85baa986a4..d361f14845aa0fb69f9a4f3feada4ec69770c74b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-27  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        [GTK][WPE] Use LazyNeverDestroyed<XErrorTrapper> to remove static initializers
>+        https://bugs.webkit.org/show_bug.cgi?id=187089
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use LazyNeverDestroyed<XErrorTrapper> instead of global std::unique_ptr<XErrorTrapper>.
>+        Since this variable's exit time destructor is not important in this code, using
>+        LazyNeverDestroyed<XErrorTrapper> is fine. This removes the last static initializer
>+        of libwebkit2gtk.so.
>+
>+        * PluginProcess/unix/PluginProcessMainUnix.cpp:
>+
> 2018-06-26  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iPad apps on macOS] Unable to interact with video elements that have started playing
>diff --git a/Source/WebCore/platform/graphics/x11/XErrorTrapper.h b/Source/WebCore/platform/graphics/x11/XErrorTrapper.h
>index 5d53b6c33bcb77aee798caf3309d15684c97b3c2..61baabe7ad91f020c25ce99b1f74e1e47463c47d 100644
>--- a/Source/WebCore/platform/graphics/x11/XErrorTrapper.h
>+++ b/Source/WebCore/platform/graphics/x11/XErrorTrapper.h
>@@ -32,6 +32,7 @@
> namespace WebCore {
> 
> class XErrorTrapper {
>+    WTF_MAKE_NONCOPYABLE(XErrorTrapper);
> public:
>     enum class Policy { Ignore, Warn, Crash };
>     XErrorTrapper(Display*, Policy = Policy::Ignore, Vector<unsigned char>&& expectedErrors = { });
>diff --git a/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp b/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp
>index 91f82b65980711b1255ba2b9b1d29fddeacc25a6..2bd2ed59ae6a2e24b0748b03cebc3563c667183e 100644
>--- a/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp
>+++ b/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp
>@@ -44,12 +44,13 @@
> #if PLATFORM(X11)
> #include <WebCore/PlatformDisplayX11.h>
> #include <WebCore/XErrorTrapper.h>
>+#include <wtf/NeverDestroyed.h>
> #endif
> 
> namespace WebKit {
> 
> #if PLATFORM(X11)
>-static std::unique_ptr<WebCore::XErrorTrapper> xErrorTrapper;
>+static LazyNeverDestroyed<WebCore::XErrorTrapper> xErrorTrapper;
> #endif
> 
> class PluginProcessMain final: public ChildProcessMainBase {
>@@ -82,7 +83,7 @@ class PluginProcessMain final: public ChildProcessMainBase {
> #if PLATFORM(X11)
>         if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::X11) {
>             auto* display = downcast<WebCore::PlatformDisplayX11>(WebCore::PlatformDisplay::sharedDisplay()).native();
>-            xErrorTrapper = std::make_unique<WebCore::XErrorTrapper>(display, WebCore::XErrorTrapper::Policy::Warn);
>+            xErrorTrapper.construct(display, WebCore::XErrorTrapper::Policy::Warn);
>         }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 187089: 343703 | 343705