Title: [209063] trunk/Source/WebKit2
Revision
209063
Author
[email protected]
Date
2016-11-28 23:27:01 -0800 (Mon, 28 Nov 2016)

Log Message

[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: trunk/Source/WebKit2/ChangeLog (209062 => 209063)


--- trunk/Source/WebKit2/ChangeLog	2016-11-29 07:08:09 UTC (rev 209062)
+++ trunk/Source/WebKit2/ChangeLog	2016-11-29 07:27:01 UTC (rev 209063)
@@ -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-28  Chris Dumez  <[email protected]>
 
         [Mac][WK2] Enable HTML interactive form validation

Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (209062 => 209063)


--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp	2016-11-29 07:08:09 UTC (rev 209062)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp	2016-11-29 07:27:01 UTC (rev 209063)
@@ -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

Reply via email to