Title: [210174] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 210174
- Author
- [email protected]
- Date
- 2016-12-27 08:43:47 -0800 (Tue, 27 Dec 2016)
Log Message
Merge r209063 - [GTK] BadDamage X Window System error in WebKit::AcceleratedBackingStoreX11::update when called from WebPageProxy::exitAcceleratedCompositingMode
https://bugs.webkit.org/show_bug.cgi?id=164303
Reviewed by Michael Catanzaro.
Trap also BadDrawable and BadDamage X errors when creating the surface and damage.
* UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
(WebKit::AcceleratedBackingStoreX11::update):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (210173 => 210174)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-12-27 16:43:39 UTC (rev 210173)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-12-27 16:43:47 UTC (rev 210174)
@@ -1,3 +1,15 @@
+2016-11-28 Carlos Garcia Campos <[email protected]>
+
+ [GTK] BadDamage X Window System error in WebKit::AcceleratedBackingStoreX11::update when called from WebPageProxy::exitAcceleratedCompositingMode
+ https://bugs.webkit.org/show_bug.cgi?id=164303
+
+ Reviewed by Michael Catanzaro.
+
+ Trap also BadDrawable and BadDamage X errors when creating the surface and damage.
+
+ * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+ (WebKit::AcceleratedBackingStoreX11::update):
+
2016-11-02 Carlos Garcia Campos <[email protected]>
[GTK] BadDamage X Window System error in WebKit::AcceleratedBackingStoreX11::update when called from WebPageProxy::exitAcceleratedCompositingMode
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (210173 => 210174)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2016-12-27 16:43:39 UTC (rev 210173)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp 2016-12-27 16:43:47 UTC (rev 210174)
@@ -158,6 +158,7 @@
float deviceScaleFactor = m_webPage.deviceScaleFactor();
size.scale(deviceScaleFactor);
+ XErrorTrapper trapper(display, XErrorTrapper::Policy::Crash, { BadDrawable, 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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
