Diff
Modified: trunk/LayoutTests/ChangeLog (120470 => 120471)
--- trunk/LayoutTests/ChangeLog 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/LayoutTests/ChangeLog 2012-06-15 16:50:44 UTC (rev 120471)
@@ -1,3 +1,13 @@
+2012-06-15 Pavel Feldman <pfeld...@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 <fmal...@chromium.org>
Specular light filters produce dark results
Modified: trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt (120470 => 120471)
--- trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt 2012-06-15 16:50:44 UTC (rev 120471)
@@ -58,6 +58,7 @@
RUNNING TEST: extension_testOnContentCommitted
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:
{
Modified: trunk/LayoutTests/inspector/extensions/extensions-resources.html (120470 => 120471)
--- trunk/LayoutTests/inspector/extensions/extensions-resources.html 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/LayoutTests/inspector/extensions/extensions-resources.html 2012-06-15 16:50:44 UTC (rev 120471)
@@ -91,7 +91,10 @@
if (!/audits-style1\.css$/.test(resource.url) || content !== expected_content)
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);
extension_runWithResource(/audits-style1\.css$/, function(resource) {
Modified: trunk/Source/WebCore/ChangeLog (120470 => 120471)
--- trunk/Source/WebCore/ChangeLog 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/ChangeLog 2012-06-15 16:50:44 UTC (rev 120471)
@@ -1,3 +1,28 @@
+2012-06-15 Pavel Feldman <pfeld...@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/_javascript_Source.js:
+ (WebInspector._javascript_Source):
+ * 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 <loi...@chromium.org>
Web Inspector: CRASH when DebuggerAgent.setBreakpoint was called twice for the same location.
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerResourceBinding.js (120470 => 120471)
--- trunk/Source/WebCore/inspector/front-end/DebuggerResourceBinding.js 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerResourceBinding.js 2012-06-15 16:50:44 UTC (rev 120471)
@@ -76,7 +76,7 @@
*/
canSetContent: function(resource)
{
- var uiSourceCode = WebInspector._javascript_Source._javascript_SourceForResource.get(resource);
+ var uiSourceCode = resource.uiSourceCode();
return !!uiSourceCode && uiSourceCode.isEditable();
},
@@ -91,7 +91,7 @@
if (!majorChange)
return;
- var _javascript_Source = WebInspector._javascript_Source._javascript_SourceForResource.get(resource);
+ var _javascript_Source = /** @type {WebInspector._javascript_Source} */ resource.uiSourceCode();
if (!_javascript_Source) {
userCallback("Resource is not editable");
return;
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js (120470 => 120471)
--- trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js 2012-06-15 16:50:44 UTC (rev 120471)
@@ -87,7 +87,6 @@
_debuggerReset: function()
{
- WebInspector._javascript_Source._javascript_SourceForResource.clear();
for (var i = 0; i < this._mappings.length; ++i)
this._mappings[i].reset();
}
Modified: trunk/Source/WebCore/inspector/front-end/ExtensionServer.js (120470 => 120471)
--- trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2012-06-15 16:50:44 UTC (rev 120471)
@@ -474,7 +474,7 @@
var resource = WebInspector.resourceTreeModel.resourceForURL(message.url);
if (!resource)
return this._status.E_NOTFOUND(message.url);
- this._getResourceContent(resource, message, port);
+ this._getResourceContent(resource.uiSourceCode() || resource, message, port);
},
_onSetResourceContent: function(message, port)
Modified: trunk/Source/WebCore/inspector/front-end/_javascript_Source.js (120470 => 120471)
--- trunk/Source/WebCore/inspector/front-end/_javascript_Source.js 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_Source.js 2012-06-15 16:50:44 UTC (rev 120471)
@@ -47,12 +47,8 @@
if (!this._formatted)
WebInspector.breakpointManager.restoreBreakpoints(this);
}.bind(this), 0);
- if (resource)
- WebInspector._javascript_Source._javascript_SourceForResource.put(resource, this);
}
-WebInspector._javascript_Source._javascript_SourceForResource = new Map();
-
WebInspector._javascript_Source.prototype = {
/**
* @param {?string} content
Modified: trunk/Source/WebCore/inspector/front-end/Resource.js (120470 => 120471)
--- trunk/Source/WebCore/inspector/front-end/Resource.js 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/inspector/front-end/Resource.js 2012-06-15 16:50:44 UTC (rev 120471)
@@ -507,6 +507,22 @@
isHidden: function()
{
return !!this._isHidden;
+ },
+
+ /**
+ * @return {WebInspector.UISourceCode}
+ */
+ uiSourceCode: function()
+ {
+ return this._uiSourceCode;
+ },
+
+ /**
+ * @param {WebInspector.UISourceCode} uiSourceCode
+ */
+ setUISourceCode: function(uiSourceCode)
+ {
+ this._uiSourceCode = uiSourceCode;
}
}
Modified: trunk/Source/WebCore/inspector/front-end/UISourceCode.js (120470 => 120471)
--- trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2012-06-15 16:48:21 UTC (rev 120470)
+++ trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2012-06-15 16:50:44 UTC (rev 120471)
@@ -42,6 +42,8 @@
{
this._url = url;
this._resource = resource;
+ if (resource)
+ resource.setUISourceCode(this);
this._parsedURL = new WebInspector.ParsedURL(url);
this._contentProvider = contentProvider;
this._sourceMapping = sourceMapping;
