Chromium Code Reviews| Index: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp |
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp |
| index 584c0164e0339ae5b3d39bc8d4e9001d6f6e7a8f..54536e1556983f4fedd77fe38ae530319a08839e 100644 |
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp |
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp |
| @@ -996,17 +996,10 @@ void V8DebuggerAgentImpl::didParseSource(std::unique_ptr<V8DebuggerScript> scrip |
| { |
| v8::HandleScope handles(m_isolate); |
| String16 scriptSource = toProtocolString(script->source(m_isolate)); |
| - bool isDeprecatedSourceURL = false; |
| if (!success) |
| - script->setSourceURL(findSourceURL(scriptSource, false, &isDeprecatedSourceURL)); |
| - else if (script->hasSourceURL()) |
| - findSourceURL(scriptSource, false, &isDeprecatedSourceURL); |
|
dgozman
2016/08/10 23:06:25
Leave the support please.
kozy
2016/08/12 18:59:32
Done.
|
| - |
| - bool isDeprecatedSourceMappingURL = false; |
| + script->setSourceURL(findSourceURL(scriptSource, false)); |
| if (!success) |
| - script->setSourceMappingURL(findSourceMapURL(scriptSource, false, &isDeprecatedSourceMappingURL)); |
| - else if (!script->sourceMappingURL().isEmpty()) |
| - findSourceMapURL(scriptSource, false, &isDeprecatedSourceMappingURL); |
|
dgozman
2016/08/10 23:06:26
ditto
kozy
2016/08/12 18:59:31
Done.
|
| + script->setSourceMappingURL(findSourceMapURL(scriptSource, false)); |
| std::unique_ptr<protocol::DictionaryValue> executionContextAuxData; |
| if (!script->executionContextAuxData().isEmpty()) |
| @@ -1016,18 +1009,16 @@ void V8DebuggerAgentImpl::didParseSource(std::unique_ptr<V8DebuggerScript> scrip |
| bool hasSourceURL = script->hasSourceURL(); |
| String16 scriptId = script->scriptId(); |
| String16 scriptURL = script->sourceURL(); |
| - bool deprecatedCommentWasUsed = isDeprecatedSourceURL || isDeprecatedSourceMappingURL; |
| const Maybe<String16>& sourceMapURLParam = script->sourceMappingURL(); |
| const Maybe<protocol::DictionaryValue>& executionContextAuxDataParam(std::move(executionContextAuxData)); |
| const bool* isInternalScriptParam = isInternalScript ? &isInternalScript : nullptr; |
| const bool* isLiveEditParam = isLiveEdit ? &isLiveEdit : nullptr; |
| const bool* hasSourceURLParam = hasSourceURL ? &hasSourceURL : nullptr; |
| - const bool* deprecatedCommentWasUsedParam = deprecatedCommentWasUsed ? &deprecatedCommentWasUsed : nullptr; |
| if (success) |
| - m_frontend.scriptParsed(scriptId, scriptURL, script->startLine(), script->startColumn(), script->endLine(), script->endColumn(), script->executionContextId(), script->hash(), executionContextAuxDataParam, isInternalScriptParam, isLiveEditParam, sourceMapURLParam, hasSourceURLParam, deprecatedCommentWasUsedParam); |
| + m_frontend.scriptParsed(scriptId, scriptURL, script->startLine(), script->startColumn(), script->endLine(), script->endColumn(), script->executionContextId(), script->hash(), executionContextAuxDataParam, isInternalScriptParam, isLiveEditParam, sourceMapURLParam, hasSourceURLParam); |
| else |
| - m_frontend.scriptFailedToParse(scriptId, scriptURL, script->startLine(), script->startColumn(), script->endLine(), script->endColumn(), script->executionContextId(), script->hash(), executionContextAuxDataParam, isInternalScriptParam, sourceMapURLParam, hasSourceURLParam, deprecatedCommentWasUsedParam); |
| + m_frontend.scriptFailedToParse(scriptId, scriptURL, script->startLine(), script->startColumn(), script->endLine(), script->endColumn(), script->executionContextId(), script->hash(), executionContextAuxDataParam, isInternalScriptParam, sourceMapURLParam, hasSourceURLParam); |
| m_scripts[scriptId] = std::move(script); |