Title: [229523] releases/WebKitGTK/webkit-2.20/Source/WebKit
- Revision
- 229523
- Author
- carlo...@webkit.org
- Date
- 2018-03-12 02:10:23 -0700 (Mon, 12 Mar 2018)
Log Message
Merge r229396 - REGRESSION(r218089): [GTK] webkit_web_view_get_inspector() needs to be called, otherwise inspector does not close
https://bugs.webkit.org/show_bug.cgi?id=181126
Reviewed by Carlos Alberto Lopez Perez.
Fix the condition to decide whether to detach the inspector view ourselves.
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformDetach): Remove the inspector view from its parent if we don't have a client
or the client didn't detach it.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (229522 => 229523)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-03-12 03:46:57 UTC (rev 229522)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-03-12 09:10:23 UTC (rev 229523)
@@ -1,3 +1,16 @@
+2018-03-07 Carlos Garcia Campos <cgar...@igalia.com>
+
+ REGRESSION(r218089): [GTK] webkit_web_view_get_inspector() needs to be called, otherwise inspector does not close
+ https://bugs.webkit.org/show_bug.cgi?id=181126
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ Fix the condition to decide whether to detach the inspector view ourselves.
+
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformDetach): Remove the inspector view from its parent if we don't have a client
+ or the client didn't detach it.
+
2018-03-06 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.19.92 release.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp (229522 => 229523)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp 2018-03-12 03:46:57 UTC (rev 229522)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp 2018-03-12 09:10:23 UTC (rev 229523)
@@ -396,7 +396,7 @@
return;
GRefPtr<GtkWidget> inspectorView = m_inspectorView;
- if (m_client && !m_client->detach(*this)) {
+ if (!m_client || !m_client->detach(*this)) {
// Detach is called when m_isAttached is true, but it could called before
// the inspector is opened if the inspector is shown/closed quickly. So,
// we might not have a parent yet.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
