Title: [124087] trunk/Source/WebKit2
- Revision
- 124087
- Author
- commit-qu...@webkit.org
- Date
- 2012-07-30 13:57:59 -0700 (Mon, 30 Jul 2012)
Log Message
[GTK] critical warning: gdk_window_get_cursor() called on a NULL window
https://bugs.webkit.org/show_bug.cgi?id=92651
Patch by Claudio Saavedra <csaave...@igalia.com> on 2012-07-30
Reviewed by Martin Robinson.
PageClientImpl::setCursor() might get called before the
window is realized, so safeguard against it.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::setCursor): early return if the window is
not realized.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (124086 => 124087)
--- trunk/Source/WebKit2/ChangeLog 2012-07-30 20:52:00 UTC (rev 124086)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-30 20:57:59 UTC (rev 124087)
@@ -1,3 +1,17 @@
+2012-07-30 Claudio Saavedra <csaave...@igalia.com>
+
+ [GTK] critical warning: gdk_window_get_cursor() called on a NULL window
+ https://bugs.webkit.org/show_bug.cgi?id=92651
+
+ Reviewed by Martin Robinson.
+
+ PageClientImpl::setCursor() might get called before the
+ window is realized, so safeguard against it.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::setCursor): early return if the window is
+ not realized.
+
2012-07-30 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r123983.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (124086 => 124087)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2012-07-30 20:52:00 UTC (rev 124086)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2012-07-30 20:57:59 UTC (rev 124087)
@@ -142,6 +142,9 @@
void PageClientImpl::setCursor(const Cursor& cursor)
{
+ if (!gtk_widget_get_realized(m_viewWidget))
+ return;
+
// [GTK] Widget::setCursor() gets called frequently
// http://bugs.webkit.org/show_bug.cgi?id=16388
// Setting the cursor may be an expensive operation in some backends,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
