Changeset 109560 in webkit

Timestamp:

Mar 2, 2012 5:15:09 AM (12 years ago)

Author:

podivilov@chromium.org

Message:

Web Inspector: update execution line using LiveLocation.
​https://bugs.webkit.org/show_bug.cgi?id=80143

Reviewed by Vsevolod Vlasov.

• inspector/front-end/DebuggerPresentationModel.js:

(WebInspector.DebuggerPresentationModel.prototype._uiSourceCodeListChanged):
(WebInspector.DebuggerPresentationModel.prototype._debuggerResumed):
(WebInspector.DebuggerPresentationModel.prototype.set selectedCallFrame.updateExecutionLine):
(WebInspector.DebuggerPresentationModel.prototype.set selectedCallFrame):

Location:

trunk

Files:

• LayoutTests/inspector/debugger/callstack-placards-discarded-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (modified) (4 diffs)

trunk/LayoutTests/inspector/debugger/callstack-placards-discarded-expected.txt

@@ -8 +8 @@
 Received DebuggerPaused event.
 Function name: testFunction
-Listeners length: 2
+Listeners length: 3
 Script execution paused.
 Script execution resumed.
@@ -14 +14 @@
 Received DebuggerPaused event.
 Function name: testFunction
-Listeners length: 2
+Listeners length: 3
 Script execution paused.
 Script execution resumed.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Pavel Podivilov  <podivilov@chromium.org>
+
+        Web Inspector: update execution line using LiveLocation.
+        https://bugs.webkit.org/show_bug.cgi?id=80143
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.prototype._uiSourceCodeListChanged):
+        (WebInspector.DebuggerPresentationModel.prototype._debuggerResumed):
+        (WebInspector.DebuggerPresentationModel.prototype.set selectedCallFrame.updateExecutionLine):
+        (WebInspector.DebuggerPresentationModel.prototype.set selectedCallFrame):
+
 2012-03-02  Leo Yang  <leo.yang@torchmobile.com.cn>
 

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

@@ -211 +211 @@
 
         this._restoreBreakpoints(rawSourceCode);
-        this._restoreExecutionLine(rawSourceCode);
 
         var uiSourceCodeList = rawSourceCode.uiSourceCodeList();
@@ -236 +235 @@
                 this._breakpointAdded(breakpoints[lineNumber]);
         }
-    },
-
-    /**
-     * @param {WebInspector.RawSourceCode} rawSourceCode
-     */
-    _restoreExecutionLine: function(rawSourceCode)
-    {
-        if (!this._selectedCallFrame || this._selectedCallFrame.rawSourceCode !== rawSourceCode)
-            return;
-
-        var uiLocation = rawSourceCode.rawLocationToUILocation(this._selectedCallFrame._callFrame.location);
-        this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ExecutionLineChanged, uiLocation);
     },
 
@@ -568 +555 @@
     set selectedCallFrame(callFrame)
     {
+        if (this._executionLineLiveLocation)
+            this._executionLineLiveLocation.dispose();
+        delete this._executionLineLiveLocation;
+        
         this._selectedCallFrame = callFrame;
         if (!this._selectedCallFrame)
@@ -575 +566 @@
         this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.CallFrameSelected, callFrame);
 
-        var uiLocation = callFrame.rawSourceCode.rawLocationToUILocation(callFrame._callFrame.location);
-        if (uiLocation)
+        function updateExecutionLine(uiLocation)
+        {
             this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ExecutionLineChanged, uiLocation);
+        }
+        this._executionLineLiveLocation = this._selectedCallFrame.rawSourceCode.createLiveLocation(callFrame._callFrame.location, updateExecutionLine.bind(this));
+        this._executionLineLiveLocation.init();
     },