third_party/WebKit/Source/core/dom/Document.cpp - Issue 1998353003: Reduce ConsoleMessage API surface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1998353003: Reduce ConsoleMessage API surface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@1999463002

Patch Set: rebased Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/RejectedPromises.cpp ('k') | third_party/WebKit/Source/core/frame/FrameConsole.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 75cd184962ba7a88a7a223f0c85ed9601f275c9e..8da90c1d1f2c9f6a4735dac439f5f8165d4cc7b0 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -5206,13 +5206,14 @@ void Document::addConsoleMessage(ConsoleMessage* consoleMessage)

if (!m_frame)

return;

- if (!consoleMessage->getScriptState() && consoleMessage->url().isNull() && !consoleMessage->lineNumber()) {

- consoleMessage->setURL(url().getString());

+ if (!consoleMessage->messageId() && !consoleMessage->relatedMessageId() && consoleMessage->url().isNull() && !consoleMessage->lineNumber()) {

+ unsigned lineNumber = 0;

if (!isInDocumentWrite() && scriptableDocumentParser()) {

ScriptableDocumentParser* parser = scriptableDocumentParser();

if (parser->isParsingAtLineNumber())

- consoleMessage->setLineNumber(parser->lineNumber().oneBasedInt());

+ lineNumber = parser->lineNumber().oneBasedInt();

}

+ consoleMessage = ConsoleMessage::create(consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), url().getString(), lineNumber, 0, consoleMessage->callStack(), 0, consoleMessage->scriptArguments());

}

m_frame->console().addMessage(consoleMessage);

}