Title: [178503] releases/WebKitGTK/webkit-2.6/Source/WebKit2
- Revision
- 178503
- Author
- [email protected]
- Date
- 2015-01-15 02:40:17 -0800 (Thu, 15 Jan 2015)
Log Message
Merge r178415 - [GTK] Do not schedule a redraw for the redirected XComposite window when not in accelerated compositing mode
https://bugs.webkit.org/show_bug.cgi?id=140354
Reviewed by Martin Robinson.
The RedirectedXCompositeWindow uses XDamage to be notified when
the XWindow has been modified. Since the redirected window is
created unconditionally we always receive a XDamage notify when
the window is mapped, and we schedule a redraw in the web view
even when the web view is not in accelerated compositing mode.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseRealize): Only call gtk_widget_queue_draw() when
in accelerated compositing mode.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (178502 => 178503)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2015-01-15 10:33:46 UTC (rev 178502)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2015-01-15 10:40:17 UTC (rev 178503)
@@ -1,3 +1,20 @@
+2015-01-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Do not schedule a redraw for the redirected XComposite window when not in accelerated compositing mode
+ https://bugs.webkit.org/show_bug.cgi?id=140354
+
+ Reviewed by Martin Robinson.
+
+ The RedirectedXCompositeWindow uses XDamage to be notified when
+ the XWindow has been modified. Since the redirected window is
+ created unconditionally we always receive a XDamage notify when
+ the window is mapped, and we schedule a redraw in the web view
+ even when the web view is not in accelerated compositing mode.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseRealize): Only call gtk_widget_queue_draw() when
+ in accelerated compositing mode.
+
2015-01-14 Carlos Garcia Campos <[email protected]>
[GTK] Do not resize the redirected XComposite window when not in accelerated compositing mode
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (178502 => 178503)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-01-15 10:33:46 UTC (rev 178502)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-01-15 10:40:17 UTC (rev 178503)
@@ -1092,7 +1092,9 @@
#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
void redirectedWindowDamagedCallback(void* data)
{
- gtk_widget_queue_draw(GTK_WIDGET(data));
+ DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(WEBKIT_WEB_VIEW_BASE(data)->priv->pageProxy->drawingArea());
+ if (drawingArea && drawingArea->isInAcceleratedCompositingMode())
+ gtk_widget_queue_draw(GTK_WIDGET(data));
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
