4a96850aeb
This reverts commit 1b3b808a54.
Reason for revert: crbug/879988
TBR=kozy@chromium.org
Original change's description:
> inspector: find magic comment using V8 scanner
>
> Inspector tries to provide sourceURL and sourceMappingURL for scripts
> with parser errors. Without this CL we convert source of each script
> to inspector string and search for magic comment there. Some web sites
> use pattern when they get some data from network and constantly try to
> parse this data as JSON, in this case we do a lot of useless work.
>
> So we can parse magic comments on V8 side only for compilation errors
> (excluding parse JSON errors), to do it we can reuse scanner by running
> it on each potential comment.
>
> R=alph@chromium.org,verwaest@chromium.org,yangguo@chromium.org
>
> Bug: chromium:873865,v8:7731
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I77c270fd0e95cd7b2c9ee4b7f72ef344bc1fa104
> Reviewed-on: https://chromium-review.googlesource.com/1182446
> Reviewed-by: Toon Verwaest <verwaest@chromium.org>
> Reviewed-by: Alexei Filippov <alph@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#55280}
TBR=alph@chromium.org,yangguo@chromium.org,kozyatinskiy@chromium.org,verwaest@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: chromium:873865, v8:7731, chromium:879988
Change-Id: Ia7ac766e19f9b58562d9430811f10b25c4556a46
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1202583
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55594}
76 lines
3.6 KiB
JavaScript
76 lines
3.6 KiB
JavaScript
// Copyright 2016 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
let {session, contextGroup, Protocol} = InspectorTest.start("Checks that inspector correctly process compiled scripts");
|
|
|
|
function addScripts() {
|
|
// sourceURL in the same line
|
|
return addScript("function foo1(){}//# sourceURL=oneline.js\n")
|
|
// sourceURL without end line
|
|
.then(() => addScript("function foo2(){}//# sourceURL=oneline-without-nl.js"))
|
|
// other source urls
|
|
.then(() => addScript("function foo3(){}\n//# sourceURL=twoline.js\n"))
|
|
.then(() => addScript("function foo4(){}\n\n//# sourceURL=threeline.js\n"))
|
|
|
|
// sourceMappingURL in the same line
|
|
.then(() => addScript("function foo5(){}//# sourceMappingURL=oneline-map\n"))
|
|
// sourceMappingURL without end line
|
|
.then(() => addScript("function foo6(){}//# sourceMappingURL=oneline-without-nl-map"))
|
|
// other sourceMappingURLs
|
|
.then(() => addScript("function foo7(){}\n//# sourceMappingURL=twoline-map\n"))
|
|
.then(() => addScript("function foo8(){}\n\n//# sourceMappingURL=threeline-map\n"))
|
|
|
|
// sourceURL + sourceMappingURL
|
|
.then(() => addScript("function foo9(){}//# sourceMappingURL=source-mapping-url-map\n//# sourceURL=source-url.js"))
|
|
.then(() => addScript("function foo10(){}//# sourceURL=source-url.js\n//# sourceMappingURL=source-mapping-url-map"))
|
|
|
|
// non zero endLine and endColumn..
|
|
.then(() => addScript("function foo11(){}\n//# sourceURL=end1.js"))
|
|
// .. + 1 character
|
|
.then(() => addScript("function foo12(){}\n//# sourceURL=end2.js "))
|
|
// script without sourceURL
|
|
.then(() => addScript("function foo13(){}"))
|
|
// script in eval
|
|
.then(() => addScript("function foo15(){}; eval(\"function foo14(){}//# sourceURL=eval.js\")//# sourceURL=eval-wrapper.js"))
|
|
// // inside sourceURL
|
|
.then(() => addScript("{a:2:\n//# sourceURL=http://a.js"))
|
|
// sourceURL and sourceMappingURL works even for script with syntax error
|
|
.then(() => addScript("}//# sourceURL=failed.js\n//# sourceMappingURL=failed-map"))
|
|
// empty lines at end
|
|
.then(() => addScript("function foo16(){}\n"))
|
|
.then(() => addScript("function foo17(){}\n\n"))
|
|
.then(() => addScript("function foo18(){}\n\n\n"))
|
|
.then(() => addScript("function foo19(){}\n\n\n\n"));
|
|
}
|
|
|
|
Protocol.Debugger.onScriptParsed((message) => requestSourceAndDump(message, true));
|
|
Protocol.Debugger.onScriptFailedToParse((message) => requestSourceAndDump(message, false));
|
|
addScripts()
|
|
.then(() => Protocol.Debugger.enable())
|
|
.then(addScripts)
|
|
.then(() => Protocol.Debugger.disable())
|
|
.then(() => InspectorTest.log("Remove script references and re-enable debugger."))
|
|
.then(() => Protocol.Runtime.evaluate(
|
|
{ expression: "for (let i = 1; i < 20; ++i) eval(`foo${i} = undefined`);" }))
|
|
.then(() => Protocol.HeapProfiler.collectGarbage())
|
|
.then(() => Protocol.Debugger.enable())
|
|
.then(InspectorTest.completeTest);
|
|
|
|
function addScript(source) {
|
|
return Protocol.Runtime.evaluate({ expression: source });
|
|
}
|
|
|
|
function requestSourceAndDump(scriptParsedMessage, scriptParsed) {
|
|
Protocol.Debugger.getScriptSource({ scriptId: scriptParsedMessage.params.scriptId })
|
|
.then((sourceMessage) => dumpScriptParsed(scriptParsedMessage, sourceMessage, scriptParsed));
|
|
}
|
|
|
|
function dumpScriptParsed(scriptParsedMessage, sourceMessage, scriptParsed) {
|
|
var sourceResult = sourceMessage.result;
|
|
sourceResult.scriptSource = sourceResult.scriptSource.replace(/\n/g, "<nl>");
|
|
InspectorTest.log(scriptParsed ? "scriptParsed" : "scriptFailedToParse");
|
|
InspectorTest.logObject(sourceResult);
|
|
InspectorTest.logMessage(scriptParsedMessage.params);
|
|
}
|