[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

pfeldman at chromium.org pfeldman at chromium.org
Sun Feb 20 23:53:04 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 9400ebdc7908fbaf4610941ecc2285609d3f08c8
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 10:24:59 2011 +0000

    2011-01-26  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: live edit does not update source snippet.
            https://bugs.webkit.org/show_bug.cgi?id=53097
    
            * inspector/front-end/ScriptsPanel.js:
            (WebInspector.ScriptsPanel.prototype._scriptSourceChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f7464b8..b7d088b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Yury Semikhatsky.
 
+        Web Inspector: live edit does not update source snippet.
+        https://bugs.webkit.org/show_bug.cgi?id=53097
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._scriptSourceChanged):
+
+2011-01-26  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
         Web Inspector: Incorrect on-hover evaluation of a variable named 'profile'.
         https://bugs.webkit.org/show_bug.cgi?id=53018
 
diff --git a/Source/WebCore/inspector/front-end/ScriptsPanel.js b/Source/WebCore/inspector/front-end/ScriptsPanel.js
index 6f2291d..88be663 100644
--- a/Source/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/Source/WebCore/inspector/front-end/ScriptsPanel.js
@@ -256,14 +256,16 @@ WebInspector.ScriptsPanel.prototype = {
         var oldSource = event.data.oldSource;
 
         var script = WebInspector.debuggerModel.scriptForSourceID(sourceID);
-        var oldView = script._sourceFrame
-        if (oldView) {
-            delete script._sourceFrame;
-            this.viewRecreated(oldView, this._sourceFrameForScriptOrResource(script));
-        }
         if (script.resource) {
+            delete script._sourceFrame;
+            delete script.resource._sourceFrame;
             var revertHandle = WebInspector.debuggerModel.editScriptSource.bind(WebInspector.debuggerModel, sourceID, oldSource);
             script.resource.setContent(script.source, revertHandle);
+        } else {
+            var oldView = script._sourceFrame;
+            delete script._sourceFrame;
+            if (oldView)
+                this.viewRecreated(oldView, this._sourceFrameForScriptOrResource(script));
         }
 
         var callFrames = WebInspector.debuggerModel.callFrames;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list