- Revision
- 211786
- Author
- carlo...@webkit.org
- Date
- 2017-02-07 01:32:49 -0800 (Tue, 07 Feb 2017)
Log Message
Merge r211145 - [GTK] UIProcess from WebKitGtk+ 2.15.x SIGSEGVs because of X Error BadDamage in WebKit::AcceleratedBackingStoreX11::update(WebKit::LayerTreeContext const&) () at Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp:145
https://bugs.webkit.org/show_bug.cgi?id=165656
Reviewed by Michael Catanzaro.
Source/WebCore:
Also return the base error code from PlatformDisplayX11::supportsXDamage().
* platform/graphics/x11/PlatformDisplayX11.cpp:
(WebCore::PlatformDisplayX11::supportsXDamage):
* platform/graphics/x11/PlatformDisplayX11.h:
Source/WebKit2:
We are incorrectly handling BadDamage errors because the BadDamage value we pass to the XErrorTrapper is not
the actual error code used by X11. Since XDamage is an extension, it has its own errors and a base error
code. We need to use the base error code we get when calling XDamageQueryExtension to pass the right error code
to the XErrorTrapper.
* UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
(WebKit::AcceleratedBackingStoreX11::create): Get also the damage base error.
(WebKit::xDamageErrorCode): Helper to get the actual error code.
(WebKit::AcceleratedBackingStoreX11::~AcceleratedBackingStoreX11): Use xDamageErrorCode().
(WebKit::AcceleratedBackingStoreX11::update): Ditto.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (211785 => 211786)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-07 09:32:41 UTC (rev 211785)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-07 09:32:49 UTC (rev 211786)
@@ -1,3 +1,16 @@
+2017-01-25 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] UIProcess from WebKitGtk+ 2.15.x SIGSEGVs because of X Error BadDamage in WebKit::AcceleratedBackingStoreX11::update(WebKit::LayerTreeContext const&) () at Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp:145
+ https://bugs.webkit.org/show_bug.cgi?id=165656
+
+ Reviewed by Michael Catanzaro.
+
+ Also return the base error code from PlatformDisplayX11::supportsXDamage().
+
+ * platform/graphics/x11/PlatformDisplayX11.cpp:
+ (WebCore::PlatformDisplayX11::supportsXDamage):
+ * platform/graphics/x11/PlatformDisplayX11.h:
+
2017-01-25 Miguel Gomez <mago...@igalia.com>
[GTK] The inspector is broken when AC support is disabled
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (211785 => 211786)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2017-02-07 09:32:41 UTC (rev 211785)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2017-02-07 09:32:49 UTC (rev 211786)
@@ -98,7 +98,8 @@
return m_supportsXComposite.value();
}
-bool PlatformDisplayX11::supportsXDamage(Optional<int>& damageEventBase) const
+
+bool PlatformDisplayX11::supportsXDamage(Optional<int>& damageEventBase, Optional<int>& damageErrorBase) const
{
if (!m_supportsXDamage) {
m_supportsXDamage = false;
@@ -106,13 +107,16 @@
if (m_display) {
int eventBase, errorBase;
m_supportsXDamage = XDamageQueryExtension(m_display, &eventBase, &errorBase);
- if (m_supportsXDamage.value())
+ if (m_supportsXDamage.value()) {
m_damageEventBase = eventBase;
+ m_damageErrorBase = errorBase;
+ }
}
#endif
}
damageEventBase = m_damageEventBase;
+ damageErrorBase = m_damageErrorBase;
return m_supportsXDamage.value();
}
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h (211785 => 211786)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h 2017-02-07 09:32:41 UTC (rev 211785)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h 2017-02-07 09:32:49 UTC (rev 211786)
@@ -43,8 +43,9 @@
Display* native() const { return m_display; }
bool supportsXComposite() const;
- bool supportsXDamage(Optional<int>& damageEventBase) const;
+ bool supportsXDamage(Optional<int>& damageEventBase, Optional<int>& damageErrorBase) const;
+
private:
Type type() const override { return PlatformDisplay::Type::X11; }
@@ -56,6 +57,7 @@
mutable Optional<bool> m_supportsXComposite;
mutable Optional<bool> m_supportsXDamage;
mutable Optional<int> m_damageEventBase;
+ mutable Optional<int> m_damageErrorBase;
};
} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (211785 => 211786)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:32:41 UTC (rev 211785)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:32:49 UTC (rev 211786)
@@ -1,3 +1,21 @@
+2017-01-25 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] UIProcess from WebKitGtk+ 2.15.x SIGSEGVs because of X Error BadDamage in WebKit::AcceleratedBackingStoreX11::update(WebKit::LayerTreeContext const&) () at Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp:145
+ https://bugs.webkit.org/show_bug.cgi?id=165656
+
+ Reviewed by Michael Catanzaro.
+
+ We are incorrectly handling BadDamage errors because the BadDamage value we pass to the XErrorTrapper is not
+ the actual error code used by X11. Since XDamage is an extension, it has its own errors and a base error
+ code. We need to use the base error code we get when calling XDamageQueryExtension to pass the right error code
+ to the XErrorTrapper.
+
+ * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+ (WebKit::AcceleratedBackingStoreX11::create): Get also the damage base error.
+ (WebKit::xDamageErrorCode): Helper to get the actual error code.
+ (WebKit::AcceleratedBackingStoreX11::~AcceleratedBackingStoreX11): Use xDamageErrorCode().
+ (WebKit::AcceleratedBackingStoreX11::update): Ditto.
+
2017-01-25 Miguel Gomez <mago...@igalia.com>
[GTK] The inspector is broken when AC support is disabled
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (211785 => 211786)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2017-02-07 09:32:41 UTC (rev 211785)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2017-02-07 09:32:49 UTC (rev 211786)
@@ -47,6 +47,7 @@
namespace WebKit {
static Optional<int> s_damageEventBase;
+static Optional<int> s_damageErrorBase;
class XDamageNotifier {
WTF_MAKE_NONCOPYABLE(XDamageNotifier);
@@ -105,7 +106,7 @@
std::unique_ptr<AcceleratedBackingStoreX11> AcceleratedBackingStoreX11::create(WebPageProxy& webPage)
{
auto& display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay());
- if (!display.supportsXComposite() || !display.supportsXDamage(s_damageEventBase))
+ if (!display.supportsXComposite() || !display.supportsXDamage(s_damageEventBase, s_damageErrorBase))
return nullptr;
return std::unique_ptr<AcceleratedBackingStoreX11>(new AcceleratedBackingStoreX11(webPage));
}
@@ -115,6 +116,12 @@
{
}
+static inline unsigned char xDamageErrorCode(unsigned char errorCode)
+{
+ ASSERT(s_damageErrorBase);
+ return static_cast<unsigned>(s_damageErrorBase.value()) + errorCode;
+}
+
AcceleratedBackingStoreX11::~AcceleratedBackingStoreX11()
{
if (!m_surface && !m_damage)
@@ -121,7 +128,7 @@
return;
Display* display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native();
- XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, BadDamage });
+ XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, xDamageErrorCode(BadDamage) });
if (m_damage) {
XDamageNotifier::singleton().remove(m_damage.get());
m_damage.reset();
@@ -138,7 +145,7 @@
Display* display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native();
if (m_surface) {
- XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, BadDamage });
+ XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, xDamageErrorCode(BadDamage) });
if (m_damage) {
XDamageNotifier::singleton().remove(m_damage.get());
m_damage.reset();
@@ -158,7 +165,7 @@
float deviceScaleFactor = m_webPage.deviceScaleFactor();
size.scale(deviceScaleFactor);
- XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, BadDamage });
+ XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, xDamageErrorCode(BadDamage) });
ASSERT(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native() == GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
GdkVisual* visual = gdk_screen_get_rgba_visual(gdk_screen_get_default());
if (!visual)
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (211785 => 211786)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2017-02-07 09:32:41 UTC (rev 211785)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2017-02-07 09:32:49 UTC (rev 211786)
@@ -61,8 +61,8 @@
#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
auto& display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay());
- Optional<int> damageBase;
- if (!display.supportsXComposite() || !display.supportsXDamage(damageBase))
+ Optional<int> damageBase, errorBase;
+ if (!display.supportsXComposite() || !display.supportsXDamage(damageBase, errorBase))
setAcceleratedCompositingEnabled(false);
}
#endif
