third_party/WebKit/Source/core/inspector/ConsoleMessage.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/ConsoleMessage.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/ConsoleMessage.h ('k') | third_party/WebKit/Source/core/inspector/InspectedFrames.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ae175e61d333540a547075f1f7778289cabfbf5e..c3ac02818e07738efb9cd00202de125558f30c1c 100644

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

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

@@ -104,7 +104,7 @@ void ConsoleMessage::setCallStack(PassRefPtr<ScriptCallStack> callStack)

}

-ScriptState* ConsoleMessage::scriptState() const

+ScriptState* ConsoleMessage::getScriptState() const

{

if (m_scriptState)

return m_scriptState->get();

@@ -181,12 +181,12 @@ unsigned ConsoleMessage::columnNumber() const

void ConsoleMessage::frameWindowDiscarded(LocalDOMWindow* window)

{

- if (scriptState() && scriptState()->domWindow() == window)

+ if (getScriptState() && getScriptState()->domWindow() == window)

setScriptState(nullptr);

if (!m_scriptArguments)

return;

- if (m_scriptArguments->scriptState()->domWindow() != window)

+ if (m_scriptArguments->getScriptState()->domWindow() != window)

return;

if (!m_message)

m_message = "<message collected>";