Changeset 120335 in webkit

Timestamp:

Jun 14, 2012 9:57:15 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: DebuggerModel should support setting breakpoints without script by sourceURL only.
​https://bugs.webkit.org/show_bug.cgi?id=88988

Reviewed by Pavel Feldman.

This change allows setting all saved breakpoints in debugger model by url before the site
with corresponding scripts was loaded (allows breaking in onload handler on first load).
This change also simplifies implementation of snippets debugging.

• inspector/front-end/BreakpointManager.js:
• inspector/front-end/DebuggerModel.js:

(WebInspector.DebuggerModel.prototype.setBreakpointByScriptLocation):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-14  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: DebuggerModel should support setting breakpoints without script by sourceURL only.
+        https://bugs.webkit.org/show_bug.cgi?id=88988
+
+        Reviewed by Pavel Feldman.
+
+        This change allows setting all saved breakpoints in debugger model by url before the site
+        with corresponding scripts was loaded (allows breaking in onload handler on first load).
+        This change also simplifies implementation of snippets debugging.
+
+        * inspector/front-end/BreakpointManager.js:
+        * inspector/front-end/DebuggerModel.js:
+        (WebInspector.DebuggerModel.prototype.setBreakpointByScriptLocation):
+
 2012-06-14  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/BreakpointManager.js

@@ -376 +376 @@
         var rawLocation = this._primaryUILocation.uiLocationToRawLocation();
         var debuggerModelLocation = /** @type {WebInspector.DebuggerModel.Location} */ rawLocation;
-        this._breakpointManager._debuggerModel.setBreakpointByScriptLocation(debuggerModelLocation, this._condition, didSetBreakpoint.bind(this));
+        if (debuggerModelLocation)
+            this._breakpointManager._debuggerModel.setBreakpointByScriptLocation(debuggerModelLocation, this._condition, didSetBreakpoint.bind(this));
+        else
+            this._breakpointManager._debuggerModel.setBreakpointByURL(this._primaryUILocation.uiSourceCode.url, this._primaryUILocation.lineNumber, 0, this._condition, didSetBreakpoint.bind(this));
+        
         /**
          * @this {WebInspector.BreakpointManager.Breakpoint}

trunk/Source/WebCore/inspector/front-end/DebuggerModel.js

@@ -136 +136 @@
         var script = this.scriptForId(rawLocation.scriptId);
         if (script.sourceURL)
-            this.setBreakpoint(script.sourceURL, rawLocation.lineNumber, rawLocation.columnNumber, condition, callback);
+            this.setBreakpointByURL(script.sourceURL, rawLocation.lineNumber, rawLocation.columnNumber, condition, callback);
         else
             this.setBreakpointBySourceId(rawLocation, condition, callback);
@@ -148 +148 @@
      * @param {function(?DebuggerAgent.BreakpointId, Array.<WebInspector.DebuggerModel.Location>)=} callback
      */
-    setBreakpoint: function(url, lineNumber, columnNumber, condition, callback)
+    setBreakpointByURL: function(url, lineNumber, columnNumber, condition, callback)
     {
         // Adjust column if needed.