Diff
Modified: trunk/LayoutTests/ChangeLog (103444 => 103445)
--- trunk/LayoutTests/ChangeLog 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/LayoutTests/ChangeLog 2011-12-21 22:08:44 UTC (rev 103445)
@@ -1,3 +1,15 @@
+2011-12-21 Adrienne Walker <[email protected]>
+
+ Unreviewed, rolling out r103408.
+ http://trac.webkit.org/changeset/103408
+ https://bugs.webkit.org/show_bug.cgi?id=75017
+
+ WorkerDevToolsSanityTest.InspectSharedWorker is failing
+ (Requested by loislo_ on #webkit).
+
+ * http/tests/inspector/compiler-source-mapping-expected.txt:
+ * http/tests/inspector/compiler-source-mapping.html:
+
2011-12-21 Stephen White <[email protected]>
Test for CSS filters crash on zero-sized element
Modified: trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-expected.txt (103444 => 103445)
--- trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-expected.txt 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-expected.txt 2011-12-21 22:08:44 UTC (rev 103445)
@@ -9,7 +9,5 @@
Running: testSections
-Running: testResolveSourceMappingURL
-
Running: testLoad
Modified: trunk/LayoutTests/http/tests/inspector/compiler-source-mapping.html (103444 => 103445)
--- trunk/LayoutTests/http/tests/inspector/compiler-source-mapping.html 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/LayoutTests/http/tests/inspector/compiler-source-mapping.html 2011-12-21 22:08:44 UTC (rev 103445)
@@ -97,7 +97,7 @@
"offset": { "line": 1, "column": 0 },
"map": {
"mappings":"AAAA,CAEC",
- "sources":["source1.js", "source2.js"]
+ "sources":["source1.js"]
}
}, {
"offset": { "line": 3, "column": 10 },
@@ -109,7 +109,6 @@
]};
var mapping = new WebInspector.ClosureCompilerSourceMapping();
mapping._parseMappingPayload(mappingPayload);
- InspectorTest.assertEquals(2, mapping.sources().length);
checkMapping(0, 0, "source1.js", 0, 0, mapping);
checkMapping(0, 1, "source1.js", 2, 1, mapping);
checkMapping(2, 10, "source2.js", 0, 0, mapping);
@@ -117,15 +116,6 @@
next();
},
- function testResolveSourceMappingURL(next)
- {
- var func = WebInspector.ClosureCompilerSourceMapping.prototype._resolveSourceMapURL;
- InspectorTest.assertEquals("http://example.com/map.json", func("http://example.com/map.json", "http://example.com/script.js"));
- InspectorTest.assertEquals("http://example.com/map.json", func("/map.json", "http://example.com/script.js"));
- InspectorTest.assertEquals("http://example.com/scripts/../maps/map.json", func("../maps/map.json", "http://example.com/scripts/script.js"));
- next();
- },
-
function testLoad(next)
{
var sourceMapping = new WebInspector.ClosureCompilerSourceMapping("http://localhost:8000/inspector/resources/source-map.json");
Modified: trunk/Source/WebCore/ChangeLog (103444 => 103445)
--- trunk/Source/WebCore/ChangeLog 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/Source/WebCore/ChangeLog 2011-12-21 22:08:44 UTC (rev 103445)
@@ -1,3 +1,21 @@
+2011-12-21 Adrienne Walker <[email protected]>
+
+ Unreviewed, rolling out r103408.
+ http://trac.webkit.org/changeset/103408
+ https://bugs.webkit.org/show_bug.cgi?id=75017
+
+ WorkerDevToolsSanityTest.InspectSharedWorker is failing
+ (Requested by loislo_ on #webkit).
+
+ * inspector/front-end/CompilerSourceMapping.js:
+ (WebInspector.ClosureCompilerSourceMapping):
+ (WebInspector.ClosureCompilerSourceMapping.prototype.sources):
+ (WebInspector.ClosureCompilerSourceMapping.prototype._parseMap):
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel.prototype.setCompilerSourceMapping):
+ * inspector/front-end/utilities.js:
+ (String.prototype.asParsedURL):
+
2011-12-21 Stephen White <[email protected]>
Fix CSS filters crash on zero-sized elements.
Modified: trunk/Source/WebCore/inspector/front-end/CompilerSourceMapping.js (103444 => 103445)
--- trunk/Source/WebCore/inspector/front-end/CompilerSourceMapping.js 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/Source/WebCore/inspector/front-end/CompilerSourceMapping.js 2011-12-21 22:08:44 UTC (rev 103445)
@@ -72,9 +72,8 @@
* @implements {WebInspector.CompilerSourceMapping}
* @constructor
* @param {string} sourceMappingURL
- * @param {string} sourceURL
*/
-WebInspector.ClosureCompilerSourceMapping = function(sourceMappingURL, scriptSourceOrigin)
+WebInspector.ClosureCompilerSourceMapping = function(sourceMappingURL)
{
if (!WebInspector.ClosureCompilerSourceMapping.prototype._base64Map) {
const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -83,7 +82,8 @@
WebInspector.ClosureCompilerSourceMapping.prototype._base64Map[base64Digits.charAt(i)] = i;
}
- this._sourceMappingURL = this._resolveSourceMapURL(sourceMappingURL, scriptSourceOrigin);
+ this._sourceMappingURL = sourceMappingURL;
+ this._sources = [];
this._mappings = [];
this._reverseMappingsBySourceURL = {};
}
@@ -131,10 +131,7 @@
*/
sources: function()
{
- var sources = [];
- for (var sourceURL in this._reverseMappingsBySourceURL)
- sources.push(sourceURL);
- return sources;
+ return this._sources;
},
/**
@@ -188,21 +185,19 @@
_parseMap: function(map, lineNumber, columnNumber)
{
- var sourceIndex = 0;
+ var sourceIndex = this._sources.length;
var sourceLineNumber = 0;
var sourceColumnNumber = 0;
var nameIndex = 0;
- var sources = [];
for (var i = 0; i < map.sources.length; ++i) {
var url = "" map.sources[i]);
- sources.push(url);
- if (!this._reverseMappingsBySourceURL[url])
- this._reverseMappingsBySourceURL[url] = [];
+ this._sources.push(url);
+ this._reverseMappingsBySourceURL[url] = [];
}
var stringCharIterator = new WebInspector.ClosureCompilerSourceMapping.StringCharIterator(map.mappings);
- var sourceURL = sources[sourceIndex];
+ var sourceURL = this._sources[sourceIndex];
var reverseMappings = this._reverseMappingsBySourceURL[sourceURL];
while (true) {
@@ -223,7 +218,7 @@
var sourceIndexDelta = this._decodeVLQ(stringCharIterator);
if (sourceIndexDelta) {
sourceIndex += sourceIndexDelta;
- sourceURL = sources[sourceIndex];
+ sourceURL = this._sources[sourceIndex];
reverseMappings = this._reverseMappingsBySourceURL[sourceURL];
}
sourceLineNumber += this._decodeVLQ(stringCharIterator);
@@ -265,21 +260,6 @@
return sourceRoot ? sourceRoot + "/" + sourceURL : sourceURL;
},
- _resolveSourceMapURL: function(sourceMappingURL, scriptSourceOrigin)
- {
- if (!sourceMappingURL || !scriptSourceOrigin)
- return sourceMappingURL;
-
- if (sourceMappingURL.asParsedURL())
- return sourceMappingURL;
-
- var origin = scriptSourceOrigin.asParsedURL();
- var baseURL = origin.scheme + "://" + origin.host + (origin.port ? ":" + origin.port : "");
- if (sourceMappingURL[0] === "/")
- return baseURL + sourceMappingURL;
- return baseURL + origin.firstPathComponents + sourceMappingURL;
- },
-
_VLQ_BASE_SHIFT: 5,
_VLQ_BASE_MASK: (1 << 5) - 1,
_VLQ_CONTINUATION_MASK: 1 << 5
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (103444 => 103445)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-12-21 22:08:44 UTC (rev 103445)
@@ -341,7 +341,7 @@
*/
setCompilerSourceMapping: function(uiSourceCode, sourceMappingURL)
{
- var sourceMapping = new WebInspector.ClosureCompilerSourceMapping(sourceMappingURL, uiSourceCode.url);
+ var sourceMapping = new WebInspector.ClosureCompilerSourceMapping(sourceMappingURL);
uiSourceCode.rawSourceCode.setCompilerSourceMapping(sourceMapping);
},
Modified: trunk/Source/WebCore/inspector/front-end/utilities.js (103444 => 103445)
--- trunk/Source/WebCore/inspector/front-end/utilities.js 2011-12-21 22:07:18 UTC (rev 103444)
+++ trunk/Source/WebCore/inspector/front-end/utilities.js 2011-12-21 22:08:44 UTC (rev 103445)
@@ -469,10 +469,8 @@
// Then take last path component.
var lastSlashIndex = path.lastIndexOf("/");
- if (lastSlashIndex !== -1) {
- result.firstPathComponents = path.substring(0, lastSlashIndex + 1);
+ if (lastSlashIndex !== -1)
result.lastPathComponent = path.substring(lastSlashIndex + 1);
- }
}
return result;
}
