Commit c4c3cc18 authored by Alexey Kozyatinskiy's avatar Alexey Kozyatinskiy Committed by Commit Bot

[DevTools] remove separate event for FailedToParseScriptSource

Everywhere on the frontend side, we use both events and process them
in the same way.

R=lushnikov@chromium.org

Bug: none
Change-Id: I3ab9b196921ff9e7e8eac86e9217b0869f0c2313
Reviewed-on: https://chromium-review.googlesource.com/1163838
Commit-Queue: Andrey Lushnikov <lushnikov@chromium.org>
Reviewed-by: default avatarAndrey Lushnikov <lushnikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580974}
parent 5ccc9e5d
Tests that FailedToParseScriptSource event is raised after compile script with syntax error. Tests that ParsedScriptSource event is raised after compile script with syntax error.
Running: testScriptParsedEvent Running: testScriptParsedEvent
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
(async function() { (async function() {
TestRunner.addResult( TestRunner.addResult(
`Tests that FailedToParseScriptSource event is raised after compile script with syntax error.\n`); `Tests that ParsedScriptSource event is raised after compile script with syntax error.\n`);
await TestRunner.loadModule('sources_test_runner'); await TestRunner.loadModule('sources_test_runner');
await TestRunner.showPanel('sources'); await TestRunner.showPanel('sources');
await TestRunner.evaluateInPagePromise(` await TestRunner.evaluateInPagePromise(`
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
SourcesTestRunner.runDebuggerTestSuite([ SourcesTestRunner.runDebuggerTestSuite([
function testScriptParsedEvent(next) { function testScriptParsedEvent(next) {
TestRunner.debuggerModel.addEventListener( TestRunner.debuggerModel.addEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource, scriptFailedToParse); SDK.DebuggerModel.Events.ParsedScriptSource, scriptFailedToParse);
TestRunner.evaluateInPage('addScript(\'resources/script-failed-to-parse.js\')'); TestRunner.evaluateInPage('addScript(\'resources/script-failed-to-parse.js\')');
function scriptFailedToParse(event) { function scriptFailedToParse(event) {
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
if (script.sourceURL.indexOf('script-failed-to-parse.js') !== -1) { if (script.sourceURL.indexOf('script-failed-to-parse.js') !== -1) {
TestRunner.addResult('Event with script-failed-to-parse.js received'); TestRunner.addResult('Event with script-failed-to-parse.js received');
TestRunner.debuggerModel.removeEventListener( TestRunner.debuggerModel.removeEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource, scriptFailedToParse); SDK.DebuggerModel.Events.ParsedScriptSource, scriptFailedToParse);
next(); next();
} }
} }
......
...@@ -46,8 +46,6 @@ Bindings.DefaultScriptMapping = class { ...@@ -46,8 +46,6 @@ Bindings.DefaultScriptMapping = class {
this._eventListeners = [ this._eventListeners = [
debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this), debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this),
debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this), debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this),
debuggerModel.addEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this),
debuggerModel.addEventListener( debuggerModel.addEventListener(
SDK.DebuggerModel.Events.DiscardedAnonymousScriptSource, this._discardedScriptSource, this) SDK.DebuggerModel.Events.DiscardedAnonymousScriptSource, this._discardedScriptSource, this)
]; ];
......
...@@ -94,9 +94,6 @@ Bindings.PresentationConsoleMessageHelper = class { ...@@ -94,9 +94,6 @@ Bindings.PresentationConsoleMessageHelper = class {
// TODO(dgozman): setImmediate because we race with DebuggerWorkspaceBinding on ParsedScriptSource event delivery. // TODO(dgozman): setImmediate because we race with DebuggerWorkspaceBinding on ParsedScriptSource event delivery.
debuggerModel.addEventListener( debuggerModel.addEventListener(
SDK.DebuggerModel.Events.ParsedScriptSource, event => setImmediate(this._parsedScriptSource.bind(this, event))); SDK.DebuggerModel.Events.ParsedScriptSource, event => setImmediate(this._parsedScriptSource.bind(this, event)));
debuggerModel.addEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource,
event => setImmediate(this._parsedScriptSource.bind(this, event)));
debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this); debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
this._locationPool = new Bindings.LiveLocationPool(); this._locationPool = new Bindings.LiveLocationPool();
......
...@@ -52,8 +52,6 @@ Bindings.ResourceScriptMapping = class { ...@@ -52,8 +52,6 @@ Bindings.ResourceScriptMapping = class {
const runtimeModel = debuggerModel.runtimeModel(); const runtimeModel = debuggerModel.runtimeModel();
this._eventListeners = [ this._eventListeners = [
this._debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this), this._debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this),
this._debuggerModel.addEventListener(
SDK.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this),
this._debuggerModel.addEventListener( this._debuggerModel.addEventListener(
SDK.DebuggerModel.Events.GlobalObjectCleared, this._globalObjectCleared, this), SDK.DebuggerModel.Events.GlobalObjectCleared, this._globalObjectCleared, this),
runtimeModel.addEventListener( runtimeModel.addEventListener(
......
...@@ -571,10 +571,7 @@ SDK.DebuggerModel = class extends SDK.SDKModel { ...@@ -571,10 +571,7 @@ SDK.DebuggerModel = class extends SDK.SDKModel {
this, scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId, this, scriptId, sourceURL, startLine, startColumn, endLine, endColumn, executionContextId,
this._internString(hash), isContentScript, isLiveEdit, sourceMapURL, hasSourceURLComment, length); this._internString(hash), isContentScript, isLiveEdit, sourceMapURL, hasSourceURLComment, length);
this._registerScript(script); this._registerScript(script);
if (!hasSyntaxError) this.dispatchEventToListeners(SDK.DebuggerModel.Events.ParsedScriptSource, script);
this.dispatchEventToListeners(SDK.DebuggerModel.Events.ParsedScriptSource, script);
else
this.dispatchEventToListeners(SDK.DebuggerModel.Events.FailedToParseScriptSource, script);
const sourceMapId = const sourceMapId =
SDK.DebuggerModel._sourceMapId(script.executionContextId, script.sourceURL, script.sourceMapURL); SDK.DebuggerModel._sourceMapId(script.executionContextId, script.sourceURL, script.sourceMapURL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment