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

WebCore/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 586 matching lines @@
 }
 
 void InspectorController::populateScriptObjects()
 {
     ASSERT(m_frontend);
     if (!m_frontend)
         return;
 
     if (m_showAfterVisible == lastActivePanel)
         m_showAfterVisible = setting(lastActivePanel);
-    if (m_nodeToFocus)
-        focusNode();
+
     showPanel(m_showAfterVisible);
 
     if (m_resourceTrackingEnabled)
         m_frontend->resourceTrackingWasEnabled();
 
     if (m_searchingForNode)
         m_frontend->searchingForNodeWasEnabled();
 
     if (m_monitoringXHR)
         m_frontend->monitoringXHRWasEnabled();
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     if (m_profilerAgent->enabled())
         m_frontend->profilerWasEnabled();
 #endif
 
     ResourcesMap::iterator resourcesEnd = m_resources.end();
     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
         it->second->updateScriptObject(m_frontend.get());
 
     m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
 
+    if (m_nodeToFocus)
+        focusNode();
+
     if (m_expiredConsoleMessageCount)
         m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();
     for (unsigned i = 0; i < messageCount; ++i)
         m_consoleMessages[i]->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     if (debuggerEnabled())
         m_frontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
 #endif
@@ skipping 1252 matching lines @@
 void InspectorController::didModifyDOMAttrImpl(Element* element)
 {
     if (m_domAgent)
         m_domAgent->didModifyDOMAttr(element);
 }
 
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)