Changeset 120336 in webkit

Timestamp:

Jun 14, 2012, 9:58:05 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Breakpoints should not be set when UISourceCode content is diverged from VM version of the script.
​https://bugs.webkit.org/show_bug.cgi?id=89109

Reviewed by Pavel Feldman.

• inspector/front-end/BreakpointManager.js:

(WebInspector.BreakpointManager.Breakpoint.prototype._updateBreakpoint):

• inspector/front-end/JavaScriptSource.js:

(WebInspector.JavaScriptSource.prototype.isDivergedFromVM):
(WebInspector.JavaScriptSource.prototype.workingCopyCommitted):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/BreakpointManager.js (modified) (1 diff)
• inspector/front-end/JavaScriptSource.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-14  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Breakpoints should not be set when UISourceCode content is diverged from VM version of the script.
+        https://bugs.webkit.org/show_bug.cgi?id=89109
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager.Breakpoint.prototype._updateBreakpoint):
+        * inspector/front-end/JavaScriptSource.js:
+        (WebInspector.JavaScriptSource.prototype.isDivergedFromVM):
+        (WebInspector.JavaScriptSource.prototype.workingCopyCommitted):
+
 2012-06-14  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -357 +357 @@
         this._breakpointManager._storage._updateBreakpoint(this);
 
-        if (this._enabled) {
+        if (this._enabled && !this._primaryUILocation.uiSourceCode.isDivergedFromVM()) {
             this._setInDebugger();
             return;

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

@@ -181 +181 @@
 
     /**
+     * @return {boolean}
+     */
+    isDivergedFromVM: function()
+    {
+        // FIXME: We should return true if this._isDivergedFromVM is set as well once we provide a way to set breakpoints after LiveEdit failure.
+        return this.isDirty();
+    },
+
+    /**
      * @param {function(?string)} callback
      */
     workingCopyCommitted: function(callback)
     {  
-        WebInspector.DebuggerResourceBinding.setScriptSource(this, this.workingCopy(), callback);
+        /**
+         * @param {?string} error
+         */
+        function innerCallback(error)
+        {
+            this._isDivergedFromVM = !!error;
+            callback(error);
+        }
+
+        WebInspector.DebuggerResourceBinding.setScriptSource(this, this.workingCopy(), innerCallback.bind(this));
     },