Changeset 117966 in webkit

Timestamp:

May 22, 2012 6:55:10 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: [regression] dynamically created script tab is bound to the document resource.
​https://bugs.webkit.org/show_bug.cgi?id=87119

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Test: inspector/debugger/dynamic-script-tag.html

• inspector/front-end/BreakpointManager.js:

(WebInspector.BreakpointManager.Breakpoint.prototype._setInDebugger.didSetBreakpoint):
(WebInspector.BreakpointManager.Breakpoint.prototype._setInDebugger):

• inspector/front-end/DebuggerModel.js:

(WebInspector.DebuggerModel.prototype.rawLocationToUILocation):

• inspector/front-end/ResourceScriptMapping.js:

(WebInspector.ResourceScriptMapping.prototype.addScript):
(WebInspector.ResourceScriptMapping.prototype._shouldBindScriptToContentProvider):

• inspector/front-end/Script.js:

(WebInspector.Script.prototype.rawLocationToUILocation):
(WebInspector.Script.Location.prototype.update):

LayoutTests:

• inspector/debugger/dynamic-script-tag-expected.txt: Added.
• inspector/debugger/dynamic-script-tag.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/dynamic-script-tag-expected.txt (added)
• LayoutTests/inspector/debugger/dynamic-script-tag.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/BreakpointManager.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerModel.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ResourceScriptMapping.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/Script.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-22  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: [regression] dynamically created script tab is bound to the document resource.
+        https://bugs.webkit.org/show_bug.cgi?id=87119
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/debugger/dynamic-script-tag-expected.txt: Added.
+        * inspector/debugger/dynamic-script-tag.html: Added.
+
 2012-05-22  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: [regression] dynamically created script tab is bound to the document resource.
+        https://bugs.webkit.org/show_bug.cgi?id=87119
+
+        Reviewed by Vsevolod Vlasov.
+
+        Test: inspector/debugger/dynamic-script-tag.html
+
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager.Breakpoint.prototype._setInDebugger.didSetBreakpoint):
+        (WebInspector.BreakpointManager.Breakpoint.prototype._setInDebugger):
+        * inspector/front-end/DebuggerModel.js:
+        (WebInspector.DebuggerModel.prototype.rawLocationToUILocation):
+        * inspector/front-end/ResourceScriptMapping.js:
+        (WebInspector.ResourceScriptMapping.prototype.addScript):
+        (WebInspector.ResourceScriptMapping.prototype._shouldBindScriptToContentProvider):
+        * inspector/front-end/Script.js:
+        (WebInspector.Script.prototype.rawLocationToUILocation):
+        (WebInspector.Script.Location.prototype.update):
+
 2012-05-22  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -382 +382 @@
             for (var i = 0; i < locations.length; ++i) {
                 var script = this._breakpointManager._debuggerModel.scriptForId(locations[i].scriptId);
-                var uiLocation = script.rawLocationToUILocation(locations[i]);
+                var uiLocation = script.rawLocationToUILocation(locations[i].lineNumber, locations[i].columnNumber);
                 if (this._breakpointManager.findBreakpoint(uiLocation.uiSourceCode, uiLocation.lineNumber)) {
                     // location clash

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

@@ -536 +536 @@
         if (!script)
             return null;
-        return script.rawLocationToUILocation(rawLocation);
+        return script.rawLocationToUILocation(rawLocation.lineNumber, rawLocation.columnNumber);
     }
 }

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

@@ -94 +94 @@
             if (resource && resource.request && !resource.request.finished)
                 resource = null;
+            // Only bind inline and standalone scripts.
+            if (resource && !this._shouldBindScriptToContentProvider(script, resource))
+                resource = null;
             if (!resource) {
                 // When there is no resource, lookup in-flight requests.
                 request = WebInspector.networkManager.inflightRequestForURL(script.sourceURL);
+                // Only bind inline and standalone scripts.
+                if (request && !this._shouldBindScriptToContentProvider(script, request))
+                  request = null;
             }
         }
@@ -124 +130 @@
 
     /**
+     * @param {WebInspector.Script} script
+     * @param {WebInspector.ContentProvider} contentProvider
+     * @return {boolean}
+     */
+    _shouldBindScriptToContentProvider: function(script, contentProvider)
+    {
+        if (script.isInlineScript())
+            return contentProvider.contentType() === WebInspector.resourceTypes.Document;
+        return contentProvider.contentType() === WebInspector.resourceTypes.Script;
+    },
+
+    /**
      * @param {WebInspector.Event} event
      */

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

@@ -168 +168 @@
 
     /**
-     * @param {DebuggerAgent.Location} rawLocation
+     * @param {number} lineNumber
+     * @param {number=} columnNumber
      * @return {WebInspector.UILocation}
      */
-    rawLocationToUILocation: function(rawLocation)
-    {
-        console.assert(rawLocation.scriptId === this.scriptId);
-        var uiLocation = this._sourceMapping.rawLocationToUILocation(rawLocation);
+    rawLocationToUILocation: function(lineNumber, columnNumber)
+    {
+        var uiLocation = this._sourceMapping.rawLocationToUILocation(new WebInspector.DebuggerModel.Location(this, lineNumber, columnNumber || 0));
         return uiLocation.uiSourceCode.overrideLocation(uiLocation);
     },
@@ -220 +220 @@
     update: function()
     {
-        var uiLocation = this._script.rawLocationToUILocation(this._rawLocation);
+        var uiLocation = this._script.rawLocationToUILocation(this._rawLocation.lineNumber, this._rawLocation.columnNumber);
         if (uiLocation) {
             var uiSourceCode = uiLocation.uiSourceCode;