[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d50dfbbdbbd00f7787bf7916745ea45e7d0ba05c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 17:24:08 2009 +0000

    2009-12-01  Yael Aharon  <yael.aharon at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c0456f2..0afcc93 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-01  Yael Aharon  <yael.aharon at 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 at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 4e465e9..a88a299 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -630,9 +630,12 @@ void InspectorController::close()
     releaseDOMAgent();
     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;
+        }
+    }
 }
 
 void InspectorController::showWindow()

-- 
WebKit Debian packaging