third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/inspector/InspectorConsoleAgent.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/core/inspector/InspectedFrames.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

index 4cf502f3fc6dea00c5fa62eac93cb6954bd8158b..7d2a924d74777f1b0a47ffbf329bce2c9f567602 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

@@ -189,15 +189,15 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console

if (consoleMessage->scriptId())

jsonObj->setScriptId(String::number(consoleMessage->scriptId()));

jsonObj->setUrl(consoleMessage->url());

- ScriptState* scriptState = consoleMessage->scriptState();

+ ScriptState* scriptState = consoleMessage->getScriptState();

if (scriptState)

jsonObj->setExecutionContextId(scriptState->contextIdInDebugger());

if (consoleMessage->source() == NetworkMessageSource && consoleMessage->requestIdentifier())

jsonObj->setNetworkRequestId(IdentifiersFactory::requestId(consoleMessage->requestIdentifier()));

RefPtrWillBeRawPtr<ScriptArguments> arguments = consoleMessage->scriptArguments();

if (arguments && arguments->argumentCount()) {

- ScriptState::Scope scope(arguments->scriptState());

- v8::Local<v8::Context> context = arguments->scriptState()->context();

+ ScriptState::Scope scope(arguments->getScriptState());

+ v8::Local<v8::Context> context = arguments->getScriptState()->context();

OwnPtr<protocol::Array<protocol::Runtime::RemoteObject>> jsonArgs = protocol::Array<protocol::Runtime::RemoteObject>::create();

if (consoleMessage->type() == TableMessageType && generatePreview) {

v8::Local<v8::Value> table = arguments->argumentAt(0).v8Value();