Title: [129133] releases/WebKitGTK/webkit-1.10/Source/WebCore
- Revision
- 129133
- Author
- [email protected]
- Date
- 2012-09-20 07:37:56 -0700 (Thu, 20 Sep 2012)
Log Message
Merger r128996 - [GTK] REGRESSION(r128907): it broke several WebKit2 API tests
https://bugs.webkit.org/show_bug.cgi?id=97092
Reviewed by Martin Robinson.
Calling resizeLater() from the constructor of
RedirectedXCompositeWindow can cause the callback to be called
later by the main loop after the RedirectedXCompositeWindow object
has been destroyed. Instead of calling resizeLater(), initialize
the usable size to the given initial size.
* platform/gtk/RedirectedXCompositeWindow.cpp:
(WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog (129132 => 129133)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-20 14:34:24 UTC (rev 129132)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-20 14:37:56 UTC (rev 129133)
@@ -1,3 +1,19 @@
+2012-09-19 Carlos Garcia Campos <[email protected]>
+
+ [GTK] REGRESSION(r128907): it broke several WebKit2 API tests
+ https://bugs.webkit.org/show_bug.cgi?id=97092
+
+ Reviewed by Martin Robinson.
+
+ Calling resizeLater() from the constructor of
+ RedirectedXCompositeWindow can cause the callback to be called
+ later by the main loop after the RedirectedXCompositeWindow object
+ has been destroyed. Instead of calling resizeLater(), initialize
+ the usable size to the given initial size.
+
+ * platform/gtk/RedirectedXCompositeWindow.cpp:
+ (WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
+
2012-09-18 Martin Robinson <[email protected]>
[GTK] [WebKit2] Use XComposite window for accelerated compositing
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp (129132 => 129133)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp 2012-09-20 14:34:24 UTC (rev 129132)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp 2012-09-20 14:37:56 UTC (rev 129133)
@@ -43,7 +43,8 @@
}
RedirectedXCompositeWindow::RedirectedXCompositeWindow(const IntSize& size)
- : m_window(0)
+ : m_usableSize(size)
+ , m_window(0)
, m_parentWindow(0)
, m_pixmap(0)
, m_surface(0)
@@ -90,7 +91,6 @@
XCompositeRedirectWindow(display, m_window, CompositeRedirectManual);
resize(size);
- resizeLater(); // Force update of the usable area.
}
RedirectedXCompositeWindow::~RedirectedXCompositeWindow()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
