diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp')
| -rw-r--r-- | WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp index 5e69c31..4bc3c32 100644 --- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp @@ -175,12 +175,15 @@ void InspectorFrontendClient::destroyInspectorWindow() core(m_inspectedWebView)->inspectorController()->disconnectFrontend(); + if (m_inspectorClient) + m_inspectorClient->releaseFrontendPage(); + gboolean handled = FALSE; g_signal_emit_by_name(webInspector, "close-window", &handled); ASSERT(handled); - if (m_inspectorClient) - m_inspectorClient->releaseFrontendPage(); + // Please do not use member variables here because InspectorFrontendClient object pointed by 'this' + // has been implicitly deleted by "close-window" function. /* we should now dispose our own reference */ g_object_unref(webInspector); |