Changeset 51544 in webkit

Timestamp:

Dec 1, 2009 9:24:08 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-01 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Timothy Hatcher.

Reloading WebInspector from context menu is closing it instead of reloading.
​https://bugs.webkit.org/show_bug.cgi?id=32004

When reloading WebInspector, don't delete its m_page.

• inspector/InspectorController.cpp: (WebCore::InspectorController::close):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-01  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Reloading WebInspector from context menu is closing it instead of reloading.
+        https://bugs.webkit.org/show_bug.cgi?id=32004
+
+        When reloading WebInspector, don't delete its m_page.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::close):
+
 2009-12-01  Steve Block  <steveblock@google.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -631 +631 @@
     m_timelineAgent = 0;
     m_scriptState = 0;
-    if (m_page)
-        m_page->setParentInspectorController(0);
-    m_page = 0;
+    if (m_page) {
+        if (!m_page->mainFrame() || !m_page->mainFrame()->loader() || !m_page->mainFrame()->loader()->isLoading()) {
+            m_page->setParentInspectorController(0);
+            m_page = 0;
+        }
+    }
 }