Merge 67185 - 2010-09-09 Ilya Tikhonovsky <loislo@chromium.org>...

WebCore/inspector/InspectorController.cpp

Index: WebCore/inspector/InspectorController.cpp
===================================================================
--- WebCore/inspector/InspectorController.cpp	(revision 67542)
+++ WebCore/inspector/InspectorController.cpp	(working copy)
@@ -604,8 +604,7 @@
 
     if (m_showAfterVisible == lastActivePanel)
         m_showAfterVisible = setting(lastActivePanel);
-    if (m_nodeToFocus)
-        focusNode();
+
     showPanel(m_showAfterVisible);
 
     if (m_resourceTrackingEnabled)
@@ -628,6 +627,9 @@
 
     m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
 
+    if (m_nodeToFocus)
+        focusNode();
+
     if (m_expiredConsoleMessageCount)
         m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();