[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ed494c2cb7f167665bb6ae0a2ba68c58bd0058fb
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 10:55:29 2010 +0000

    2010-08-26  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: enable debugger after resources are pushed to front-end
            https://bugs.webkit.org/show_bug.cgi?id=44673
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::connectFrontend):
            (WebCore::InspectorController::populateScriptObjects):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 88c5d36..1ea2839 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-26  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: enable debugger after resources are pushed to front-end
+        https://bugs.webkit.org/show_bug.cgi?id=44673
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::connectFrontend):
+        (WebCore::InspectorController::populateScriptObjects):
+
 2010-08-26  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index f47b321..890d599 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -490,24 +490,6 @@ void InspectorController::connectFrontend()
     // Initialize Web Inspector title.
     m_frontend->inspectedURLChanged(m_inspectedPage->mainFrame()->loader()->url().string());
 
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled()) {
-        // FIXME (40364): This will force pushing script sources to frontend even if script
-        // panel is inactive.
-        enableDebuggerFromFrontend(false);
-    } else {
-        String debuggerEnabled = setting(debuggerEnabledSettingName);
-        if (debuggerEnabled == "true" || m_attachDebuggerWhenShown)
-            enableDebugger();
-    }
-    m_profilerAgent->setFrontend(m_frontend.get());
-    if (!ScriptProfiler::isProfilerAlwaysEnabled()) {
-        String profilerEnabledSetting = setting(profilerEnabledSettingName);
-        if (profilerEnabledSetting == "true")
-            enableProfiler();
-    }
-#endif
-
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend.get());
 #endif
@@ -676,6 +658,22 @@ void InspectorController::populateScriptObjects()
     for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); it != m_pendingEvaluateTestCommands.end(); ++it)
         m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
     m_pendingEvaluateTestCommands.clear();
+
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+    if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled())
+        enableDebuggerFromFrontend(false);
+    else {
+        String debuggerEnabled = setting(debuggerEnabledSettingName);
+        if (debuggerEnabled == "true" || m_attachDebuggerWhenShown)
+            enableDebugger();
+    }
+    m_profilerAgent->setFrontend(m_frontend.get());
+    if (!ScriptProfiler::isProfilerAlwaysEnabled()) {
+        String profilerEnabledSetting = setting(profilerEnabledSettingName);
+        if (profilerEnabledSetting == "true")
+            enableProfiler();
+    }
+#endif
 }
 
 void InspectorController::unbindAllResources()

-- 
WebKit Debian packaging