Changeset 60965 in webkit

Timestamp:

Jun 10, 2010 10:59:59 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-06-10 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: to reduce the front end start up time don't push script
sources to frontend if debugger is always enabled, instead request
script content lazily at the moment it should be displyed. It is critical for
always enabled debugger because in that case lots of script may have
already been parsed when the front end is opening and pushing all
of them at once may slow things down(even though the script sources will never
be used if scripts panel isn't open).
​https://bugs.webkit.org/show_bug.cgi?id=40364

• inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::getScriptSource):
• inspector/InspectorBackend.h:
• inspector/InspectorBackend.idl:
• inspector/InspectorController.cpp: (WebCore::InspectorController::didCommitLoad): (WebCore::InspectorController::getScriptSource): (WebCore::InspectorController::didParseSource):
• inspector/InspectorController.h:
• inspector/InspectorFrontend.cpp: (WebCore::InspectorFrontend::didGetScriptSource):
• inspector/InspectorFrontend.h:
• inspector/front-end/InspectorBackendStub.js: (.WebInspector.InspectorBackendStub.prototype.editScriptSource): (.WebInspector.InspectorBackendStub.prototype.getScriptSource):
• inspector/front-end/ScriptView.js: (WebInspector.ScriptView.prototype.setupSourceFrameIfNeeded): (WebInspector.ScriptView.prototype._didGetScriptSource): (WebInspector.ScriptView.prototype._sourceFrameSetupFinished):

2010-06-10 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: to reduce the front end start up time don't push script
sources to frontend if debugger is always enabled, instead request
script content lazily at the moment it should be displyed. It is critical for
always enabled debugger because in that case lots of script may have
already been parsed when the front end is opening and pushing all
of them at once may slow things down(even though the script sources will never
be used if scripts panel isn't open).
​https://bugs.webkit.org/show_bug.cgi?id=40364

• src/js/DevTools.js:
• src/js/InspectorControllerImpl.js: (devtools.InspectorBackendImpl): (.devtools.InspectorBackendImpl.prototype.getScriptSource):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorBackend.cpp (modified) (1 diff)
• WebCore/inspector/InspectorBackend.h (modified) (1 diff)
• WebCore/inspector/InspectorBackend.idl (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (4 diffs)
• WebCore/inspector/InspectorController.h (modified) (2 diffs)
• WebCore/inspector/InspectorFrontend.cpp (modified) (1 diff)
• WebCore/inspector/InspectorFrontend.h (modified) (1 diff)
• WebCore/inspector/front-end/InspectorBackendStub.js (modified) (1 diff)
• WebCore/inspector/front-end/ScriptView.js (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/js/DevTools.js (modified) (1 diff)
• WebKit/chromium/src/js/InspectorControllerImpl.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-10  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: to reduce the front end start up time don't push script
+        sources to frontend if debugger is always enabled, instead request
+        script content lazily at the moment it should be displyed. It is critical for
+        always enabled debugger because in that case lots of script may have
+        already been parsed when the front end is opening and pushing all
+        of them at once may slow things down(even though the script sources will never
+        be used if scripts panel isn't open).
+        https://bugs.webkit.org/show_bug.cgi?id=40364
+
+        * inspector/InspectorBackend.cpp:
+        (WebCore::InspectorBackend::getScriptSource):
+        * inspector/InspectorBackend.h:
+        * inspector/InspectorBackend.idl:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didCommitLoad):
+        (WebCore::InspectorController::getScriptSource):
+        (WebCore::InspectorController::didParseSource):
+        * inspector/InspectorController.h:
+        * inspector/InspectorFrontend.cpp:
+        (WebCore::InspectorFrontend::didGetScriptSource):
+        * inspector/InspectorFrontend.h:
+        * inspector/front-end/InspectorBackendStub.js:
+        (.WebInspector.InspectorBackendStub.prototype.editScriptSource):
+        (.WebInspector.InspectorBackendStub.prototype.getScriptSource):
+        * inspector/front-end/ScriptView.js:
+        (WebInspector.ScriptView.prototype.setupSourceFrameIfNeeded):
+        (WebInspector.ScriptView.prototype._didGetScriptSource):
+        (WebInspector.ScriptView.prototype._sourceFrameSetupFinished):
+
 2010-06-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/inspector/InspectorBackend.cpp

@@ -222 +222 @@
 }
 
+void InspectorBackend::getScriptSource(long callId, const String& sourceID)
+{
+    if (m_inspectorController)
+        m_inspectorController->getScriptSource(callId, sourceID);
+}
+
 void InspectorBackend::enableProfiler(bool always)
 {

trunk/WebCore/inspector/InspectorBackend.h

@@ -92 +92 @@
 
     void editScriptSource(long callId, const String& sourceID, const String& newContent);
+    void getScriptSource(long callId, const String& sourceID);
 
     void enableProfiler(bool always);

trunk/WebCore/inspector/InspectorBackend.idl

@@ -67 +67 @@
 
         void editScriptSource(in long callId, in DOMString sourceID, in DOMString newContent);
+        void getScriptSource(in long callId, in DOMString sourceID);
 
         void enableProfiler(in boolean always);

trunk/WebCore/inspector/InspectorController.cpp

@@ -668 +668 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         m_sourceIDToURL.clear();
+        m_scriptIDToContent.clear();
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
@@ -1634 +1635 @@
 }
 
+void InspectorController::getScriptSource(long callId, const String& sourceID)
+{
+    if (!m_frontend)
+        return;
+    String scriptSource = m_scriptIDToContent.get(sourceID);
+    m_frontend->didGetScriptSource(callId, scriptSource);
+}
+
 void InspectorController::resumeDebugger()
 {
@@ -1684 +1693 @@
 void InspectorController::didParseSource(const String& sourceID, const String& url, const String& data, int firstLine, ScriptWorldType worldType)
 {
-    m_frontend->parsedScriptSource(sourceID, url, data, firstLine, worldType);
+    // Don't send script content to the front end until it's realy needed.
+    m_frontend->parsedScriptSource(sourceID, url, "", firstLine, worldType);
 
     if (url.isEmpty())
@@ -1700 +1710 @@
 
     m_sourceIDToURL.set(sourceID, url);
+    m_scriptIDToContent.set(sourceID, data);
 }
 

trunk/WebCore/inspector/InspectorController.h

@@ -243 +243 @@
 
     void editScriptSource(long callId, const String& sourceID, const String& newContent);
+    void getScriptSource(long callId, const String& sourceID);
 
     void resumeDebugger();
@@ -362 +363 @@
     ScriptState* m_pausedScriptState;
     HashMap<String, String> m_sourceIDToURL;
+    HashMap<String, String> m_scriptIDToContent;
     HashMap<String, SourceBreakpoints> m_stickyBreakpoints;
 

trunk/WebCore/inspector/InspectorFrontend.cpp

@@ -371 +371 @@
 }
 
+void InspectorFrontend::didGetScriptSource(long callId, const String& result)
+{
+    ScriptFunctionCall function(m_webInspector, "dispatch");
+    function.appendArgument("didGetScriptSource");
+    function.appendArgument(callId);
+    function.appendArgument(result);
+    function.call();
+}
+
 void InspectorFrontend::profilerWasEnabled()
 {

trunk/WebCore/inspector/InspectorFrontend.h

@@ -100 +100 @@
 
         void didEditScriptSource(long callId, bool success, const String& result, SerializedScriptValue* newCallFrames);
+        void didGetScriptSource(long callId, const String& result);
 
         void profilerWasEnabled();

trunk/WebCore/inspector/front-end/InspectorBackendStub.js

@@ -186 +186 @@
     },
 
+    editScriptSource: function()
+    {
+        WebInspector.didEditScriptSource(callId, false);
+    },
+
+    getScriptSource: function(callId, sourceID)
+    {
+        WebInspector.didGetScriptSource(callId, null);
+    },
+
     resumeDebugger: function()
     {

trunk/WebCore/inspector/front-end/ScriptView.js

@@ -51 +51 @@
         if (!this._frameNeedsSetup)
             return;
+        delete this._frameNeedsSetup;
 
         this.attach();
 
+        if (this.script.source)
+            this._sourceFrameSetupFinished();
+        else {
+            var callbackId = WebInspector.Callback.wrap(this._didGetScriptSource.bind(this))
+            InspectorBackend.getScriptSource(callbackId, this.script.sourceID);
+        }
+    },
+
+    _didGetScriptSource: function(source)
+    {
+        this.script.source = source || WebInspector.UIString("<source is not available>");
+        this._sourceFrameSetupFinished();
+    },
+
+    _sourceFrameSetupFinished: function()
+    {
         this.sourceFrame.setContent("text/javascript", this._prependWhitespace(this.script.source));
         this._sourceFrameSetup = true;
-        delete this._frameNeedsSetup;
     },
 
@@ -107 +123 @@
     showingLastSearchResult: WebInspector.SourceView.prototype.showingLastSearchResult,
     _jumpToSearchResult: WebInspector.SourceView.prototype._jumpToSearchResult,
-    _sourceFrameSetupFinished: WebInspector.SourceView.prototype._sourceFrameSetupFinished,
     _removeBreakpoint: WebInspector.SourceView.prototype._removeBreakpoint,
     _editLine: WebInspector.SourceView.prototype._editLine,
@@ -114 +129 @@
 
 WebInspector.ScriptView.prototype.__proto__ = WebInspector.View.prototype;
+
+WebInspector.didGetScriptSource = WebInspector.Callback.processCallback;

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-10  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: to reduce the front end start up time don't push script
+        sources to frontend if debugger is always enabled, instead request
+        script content lazily at the moment it should be displyed. It is critical for
+        always enabled debugger because in that case lots of script may have
+        already been parsed when the front end is opening and pushing all
+        of them at once may slow things down(even though the script sources will never
+        be used if scripts panel isn't open).
+        https://bugs.webkit.org/show_bug.cgi?id=40364
+
+        * src/js/DevTools.js:
+        * src/js/InspectorControllerImpl.js:
+        (devtools.InspectorBackendImpl):
+        (.devtools.InspectorBackendImpl.prototype.getScriptSource):
+
 2010-06-10  Mike Belshe  <mbelshe@google.com>
 

trunk/WebKit/chromium/src/js/DevTools.js

@@ -211 +211 @@
 if (!window.v8ScriptDebugServerEnabled) {
 
-/**
- * This override is necessary for adding script source asynchronously.
- * @override
- */
-WebInspector.ScriptView.prototype.setupSourceFrameIfNeeded = function()
-{
-    if (!this._frameNeedsSetup)
-        return;
-
-    this.attach();
-
-    if (this.script.source)
-        this.didResolveScriptSource_();
-    else {
-        var self = this;
-        devtools.tools.getDebuggerAgent().resolveScriptSource(
-            this.script.sourceID,
-            function(source) {
-                self.script.source = source || WebInspector.UIString("<source is not available>");
-                self.didResolveScriptSource_();
-            });
-    }
-};
-
-
-/**
- * Performs source frame setup when script source is aready resolved.
- */
-WebInspector.ScriptView.prototype.didResolveScriptSource_ = function()
-{
-    this.sourceFrame.setContent("text/javascript", this._prependWhitespace(this.script.source));
-    this._sourceFrameSetup = true;
-    delete this._frameNeedsSetup;
-};
-
-
 (function()
 {

trunk/WebKit/chromium/src/js/InspectorControllerImpl.js

@@ -95 +95 @@
     this.installInspectorControllerDelegate_("disableDebugger");
     this.installInspectorControllerDelegate_("editScriptSource");
+    this.installInspectorControllerDelegate_("getScriptSource");
     this.installInspectorControllerDelegate_("enableDebugger");
     this.installInspectorControllerDelegate_("setBreakpoint");
@@ -151 +152 @@
 
 
+devtools.InspectorBackendImpl.prototype.getScriptSource = function(callID, sourceID)
+{
+    devtools.tools.getDebuggerAgent().resolveScriptSource(
+        sourceID,
+        function(source) {
+             WebInspector.didGetScriptSource(callID, source);
+        });
+};
+
+
 devtools.InspectorBackendImpl.prototype.activateBreakpoints = function()
 {