Changeset 66989 in webkit

Timestamp:

Sep 8, 2010 9:11:12 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-08 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: add breakpoints to source frame after content is loaded.
​https://bugs.webkit.org/show_bug.cgi?id=43056

• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._resourceLoadingFinished): (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
• inspector/front-end/SourceView.js: (WebInspector.SourceView.prototype._contentLoaded):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ScriptsPanel.js (modified) (2 diffs)
• inspector/front-end/SourceView.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-08  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add breakpoints to source frame after content is loaded.
+        https://bugs.webkit.org/show_bug.cgi?id=43056
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._resourceLoadingFinished):
+        (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
+        * inspector/front-end/SourceView.js:
+        (WebInspector.SourceView.prototype._contentLoaded):
+
 2010-09-08  Andreas Kling  <andreas.kling@nokia.com>
 

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

@@ -277 +277 @@
             // Remove script from the files list.
             script.filesSelectOption.parentElement.removeChild(script.filesSelectOption);
-
-            // Move breakpoints to the resource's frame.
-            if (script._scriptView) {
-                var sourceFrame = script._scriptView.sourceFrame;
-                var resourceFrame = this._sourceFrameForScriptOrResource(resource);
-                for (var j = 0; j < sourceFrame.breakpoints; ++j)
-                    resourceFrame.addBreakpoint(sourceFrame.breakpoints[j]);
-            }
         }
         // Adding first script will add resource.
@@ -600 +592 @@
             view = WebInspector.panels.resources.resourceViewForResource(scriptOrResource);
             view.headersVisible = false;
-            var sourceFrame = this._sourceFrameForScriptOrResource(scriptOrResource);
-            var breakpoints = WebInspector.breakpointManager.breakpointsForURL(scriptOrResource.url);
-            for (var i = 0; i < breakpoints.length; ++i)
-                sourceFrame.addBreakpoint(breakpoints[i]);
         } else if (scriptOrResource instanceof WebInspector.Script)
             view = this.scriptViewForScript(scriptOrResource);

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

@@ -100 +100 @@
         this.sourceFrame.setContent(mimeType, content, this.resource.url);
         this._sourceFrameSetupFinished();
+        var breakpoints = WebInspector.breakpointManager.breakpointsForURL(this.resource.url);
+        for (var i = 0; i < breakpoints.length; ++i)
+            this.sourceFrame.addBreakpoint(breakpoints[i]);
     },