Title: [159927] releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk
- Revision
- 159927
- Author
- [email protected]
- Date
- 2013-12-02 02:47:57 -0800 (Mon, 02 Dec 2013)
Log Message
Merge r159926 - [GTK] GTK2 paint code path does not render AC layers
https://bugs.webkit.org/show_bug.cgi?id=124967
Patch by Gustavo Noronha Silva <[email protected]> on 2013-12-02
Reviewed by Carlos Garcia Campos.
* webkit/webkitwebview.cpp:
(webkit_web_view_expose_event): also paint AC layers when painting the widget,
when AC is on.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/ChangeLog (159926 => 159927)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/ChangeLog 2013-12-02 10:44:53 UTC (rev 159926)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/ChangeLog 2013-12-02 10:47:57 UTC (rev 159927)
@@ -1,3 +1,14 @@
+2013-12-02 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] GTK2 paint code path does not render AC layers
+ https://bugs.webkit.org/show_bug.cgi?id=124967
+
+ Reviewed by Carlos Garcia Campos.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_expose_event): also paint AC layers when painting the widget,
+ when AC is on.
+
2013-11-28 Gustavo Noronha Silva <[email protected]>
REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/webkit/webkitwebview.cpp (159926 => 159927)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-12-02 10:44:53 UTC (rev 159926)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-12-02 10:47:57 UTC (rev 159927)
@@ -669,6 +669,17 @@
gdk_region_get_rectangles(event->region, &rects.outPtr(), &rectCount);
RefPtr<cairo_t> cr = adoptRef(gdk_cairo_create(event->window));
+
+ WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv;
+#if USE(TEXTURE_MAPPER)
+ GdkRectangle clipRect;
+ gdk_region_get_clipbox(event->region, &clipRect);
+ if (priv->acceleratedCompositingContext->renderLayersToWindow(cr.get(), clipRect)) {
+ GTK_WIDGET_CLASS(webkit_web_view_parent_class)->expose_event(widget, event);
+ return FALSE;
+ }
+#endif
+
for (int i = 0; i < rectCount; i++) {
copyRectFromCairoSurfaceToContext(WEBKIT_WEB_VIEW(widget)->priv->backingStore->cairoSurface(),
cr.get(), IntSize(), IntRect(rects.get()[i]));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
