[webkit-changes] [207099] releases/WebKitGTK/webkit-2.14/Source/WebKit2

[carlosgc]

Title: [207099] releases/WebKitGTK/webkit-2.14/Source/WebKit2

Revision

207099

Author

carlo...@webkit.org

Date

2016-10-11 05:01:54 -0700 (Tue, 11 Oct 2016)

Log Message

Merge r206305 - [GTK] BadDamage X error in /webkit2/WebKitWebView/preferred-size
https://bugs.webkit.org/show_bug.cgi?id=162489

Reviewed by Michael Catanzaro.

Do a XSync right after creating/destroying the XDamage used by the redirected window in X11.

* UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
(WebKit::AcceleratedBackingStoreX11::~AcceleratedBackingStoreX11):
(WebKit::AcceleratedBackingStoreX11::update):

Modified Paths

• releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog
• releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (207098 => 207099)

--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-10-11 12:01:09 UTC (rev 207098)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-10-11 12:01:54 UTC (rev 207099)
@@ -1,5 +1,18 @@
 2016-09-23  Carlos Garcia Campos  <cgar...@igalia.com>
 
+        [GTK] BadDamage X error in /webkit2/WebKitWebView/preferred-size
+        https://bugs.webkit.org/show_bug.cgi?id=162489
+
+        Reviewed by Michael Catanzaro.
+
+        Do a XSync right after creating/destroying the XDamage used by the redirected window in X11.
+
+        * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+        (WebKit::AcceleratedBackingStoreX11::~AcceleratedBackingStoreX11):
+        (WebKit::AcceleratedBackingStoreX11::update):
+
+2016-09-23  Carlos Garcia Campos  <cgar...@igalia.com>
+
         REGRESSION(r194387): Crash on github.com in IntlDateTimeFormat::resolvedOptions in C locale
         https://bugs.webkit.org/show_bug.cgi?id=162139
 

Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (207098 => 207099)

--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp	2016-10-11 12:01:09 UTC (rev 207098)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreX11.cpp	2016-10-11 12:01:54 UTC (rev 207099)
@@ -118,6 +118,7 @@
     if (m_damage) {
         XDamageNotifier::singleton().remove(m_damage.get());
         m_damage.reset();
+        XSync(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native(), False);
     }
 }
 
@@ -127,10 +128,13 @@
     if (m_surface && cairo_xlib_surface_get_drawable(m_surface.get()) == pixmap)
         return;
 
+    Display* display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native();
+
     if (m_surface) {
         if (m_damage) {
             XDamageNotifier::singleton().remove(m_damage.get());
             m_damage.reset();
+            XSync(display, False);
         }
         m_surface = nullptr;
     }
@@ -146,7 +150,6 @@
     float deviceScaleFactor = m_webPage.deviceScaleFactor();
     size.scale(deviceScaleFactor);
 
-    Display* display = downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native();
     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)
@@ -158,6 +161,7 @@
         if (m_webPage.isViewVisible())
             gtk_widget_queue_draw(m_webPage.viewWidget());
     });
+    XSync(display, False);
 }
 
 bool AcceleratedBackingStoreX11::paint(cairo_t* cr, const IntRect& clipRect)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes