Changeset 120471 in webkit

Timestamp:

Jun 15, 2012, 9:50:44 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: extension's Resource.getContent always returns original revision.
​https://bugs.webkit.org/show_bug.cgi?id=89219

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Fetching proper content from the UISourceCode now.

• inspector/front-end/DebuggerResourceBinding.js:

(WebInspector.DebuggerResourceBinding.prototype.canSetContent):
(WebInspector.DebuggerResourceBinding.prototype.setContent):

• inspector/front-end/DebuggerScriptMapping.js:

(WebInspector.DebuggerScriptMapping.prototype._debuggerReset):

• inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer.prototype._onGetResourceContent):

• inspector/front-end/JavaScriptSource.js:

(WebInspector.JavaScriptSource):

• inspector/front-end/Resource.js:

(WebInspector.Resource.prototype.isHidden):
(WebInspector.Resource.prototype.uiSourceCode):
(WebInspector.Resource.prototype.setUISourceCode):

• inspector/front-end/UISourceCode.js:

(WebInspector.UISourceCode):

LayoutTests:

• inspector/extensions/extensions-resources-expected.txt:
• inspector/extensions/extensions-resources.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/extensions/extensions-resources-expected.txt (modified) (1 diff)
• LayoutTests/inspector/extensions/extensions-resources.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerResourceBinding.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/DebuggerScriptMapping.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ExtensionServer.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/JavaScriptSource.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/Resource.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/UISourceCode.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: extension's Resource.getContent always returns original revision.
+        https://bugs.webkit.org/show_bug.cgi?id=89219
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/extensions/extensions-resources-expected.txt:
+        * inspector/extensions/extensions-resources.html:
+
 2012-06-15  Florin Malita  <fmalita@chromium.org>
 

trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt

@@ -59 +59 @@
 log: Extension server error: Operation failed: Resource is not editable
 content committed for resource .../audits-style1.css (type: stylesheet), new content: div.test { width: 220px; height: 42px; }
+Revision content: div.test { width: 220px; height: 42px; }
 RUNNING TEST: extension_testOnResourceAdded
 resource added:

trunk/LayoutTests/inspector/extensions/extensions-resources.html

@@ -92 +92 @@
             output("FAIL: stray onContentEdited event");
         webInspector.inspectedWindow.onResourceContentCommitted.removeListener(onContentCommitted);
-        nextTest();
+        resource.getContent(function(content) {
+            output("Revision content: " + content);
+            nextTest();
+        });
     }
     webInspector.inspectedWindow.onResourceContentCommitted.addListener(onContentCommitted);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-15  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: extension's Resource.getContent always returns original revision.
+        https://bugs.webkit.org/show_bug.cgi?id=89219
+
+        Reviewed by Vsevolod Vlasov.
+
+        Fetching proper content from the UISourceCode now.
+
+        * inspector/front-end/DebuggerResourceBinding.js:
+        (WebInspector.DebuggerResourceBinding.prototype.canSetContent):
+        (WebInspector.DebuggerResourceBinding.prototype.setContent):
+        * inspector/front-end/DebuggerScriptMapping.js:
+        (WebInspector.DebuggerScriptMapping.prototype._debuggerReset):
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer.prototype._onGetResourceContent):
+        * inspector/front-end/JavaScriptSource.js:
+        (WebInspector.JavaScriptSource):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.isHidden):
+        (WebInspector.Resource.prototype.uiSourceCode):
+        (WebInspector.Resource.prototype.setUISourceCode):
+        * inspector/front-end/UISourceCode.js:
+        (WebInspector.UISourceCode):
+
 2012-06-15  Ilya Tikhonovsky  <loislo@chromium.org>
 

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

@@ -77 +77 @@
     canSetContent: function(resource)
     {
-        var uiSourceCode = WebInspector.JavaScriptSource.javaScriptSourceForResource.get(resource);
+        var uiSourceCode = resource.uiSourceCode();
         return !!uiSourceCode && uiSourceCode.isEditable();
     },
@@ -92 +92 @@
             return;
 
-        var javaScriptSource = WebInspector.JavaScriptSource.javaScriptSourceForResource.get(resource);
+        var javaScriptSource = /** @type {WebInspector.JavaScriptSource} */ resource.uiSourceCode();
         if (!javaScriptSource) {
             userCallback("Resource is not editable");

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

@@ -88 +88 @@
     _debuggerReset: function()
     {
-        WebInspector.JavaScriptSource.javaScriptSourceForResource.clear();
         for (var i = 0; i < this._mappings.length; ++i)
             this._mappings[i].reset();

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

@@ -475 +475 @@
         if (!resource)
             return this._status.E_NOTFOUND(message.url);
-        this._getResourceContent(resource, message, port);
+        this._getResourceContent(resource.uiSourceCode() || resource, message, port);
     },
 

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

@@ -48 +48 @@
             WebInspector.breakpointManager.restoreBreakpoints(this);
     }.bind(this), 0);
-    if (resource)
-        WebInspector.JavaScriptSource.javaScriptSourceForResource.put(resource, this);
 }
-
-WebInspector.JavaScriptSource.javaScriptSourceForResource = new Map();
 
 WebInspector.JavaScriptSource.prototype = {

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

@@ -508 +508 @@
     {
         return !!this._isHidden; 
+    },
+
+    /**
+     * @return {WebInspector.UISourceCode}
+     */
+    uiSourceCode: function()
+    {
+        return this._uiSourceCode;
+    },
+
+    /**
+     * @param {WebInspector.UISourceCode} uiSourceCode
+     */
+    setUISourceCode: function(uiSourceCode)
+    {
+        this._uiSourceCode = uiSourceCode;
     }
 }

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

@@ -43 +43 @@
     this._url = url;
     this._resource = resource;
+    if (resource)
+        resource.setUISourceCode(this);
     this._parsedURL = new WebInspector.ParsedURL(url);
     this._contentProvider = contentProvider;