WebKit side of merge from r41149 to r41181.

WebCore/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007 Google Inc. All rights reserved.
  * Authors: Collin Jackson, Adam Barth
  *
  * This is the V8 version of the KJS InspectorController, which is located in
  * webkit/pending.
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 830 matching lines @@
 
     // m_inspectedPage should have been cleared by inspectedPageDestroyed
     ASSERT(!m_inspectedPage);
 
     deleteAllValues(m_frameResources);
     deleteAllValues(m_consoleMessages);
 }
 
 void InspectorController::inspectedPageDestroyed()
 {
-    close();
-
     ASSERT(m_inspectedPage);
     m_inspectedPage = 0;
+
+    close();
 }
 
 bool InspectorController::enabled() const
 {
     if (!m_inspectedPage)
         return false;
 
     bool b = m_inspectedPage->settings()->developerExtrasEnabled();
 
     return b;
@@ skipping 1170 matching lines @@
 }
 
 bool InspectorController::stopTiming(const String& title, double& elapsed)
 {
     elapsed = 0;
     notImplemented();
     return false;
 }
 
 } // namespace WebCore