Source/core/frame/csp/CSPDirectiveList.cpp - Issue 419203004: DevTools: wrapping arguments addConsoleMessage in ConsoleMessage

Unified Diff: Source/core/frame/csp/CSPDirectiveList.cpp

Issue 419203004: DevTools: wrapping arguments addConsoleMessage in ConsoleMessage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@wrap-not-all-console-args

Patch Set: Created 6 years, 4 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

Index: Source/core/frame/csp/CSPDirectiveList.cpp

diff --git a/Source/core/frame/csp/CSPDirectiveList.cpp b/Source/core/frame/csp/CSPDirectiveList.cpp

index 32a21f4b714b07d0bd47acadeb22eb6de074f8fd..19e660fc9c91fe0eaff708c6e731d95b36cc3c85 100644

--- a/Source/core/frame/csp/CSPDirectiveList.cpp

+++ b/Source/core/frame/csp/CSPDirectiveList.cpp

@@ -7,6 +7,7 @@

#include "core/dom/Document.h"

#include "core/frame/LocalFrame.h"

+#include "core/inspector/ConsoleMessage.h"

#include "platform/ParsingUtilities.h"

#include "platform/weborigin/KURL.h"

#include "wtf/text/WTFString.h"

@@ -45,21 +46,23 @@ PassOwnPtr<CSPDirectiveList> CSPDirectiveList::create(ContentSecurityPolicy* pol

void CSPDirectiveList::reportViolation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL) const

{

String message = m_reportOnly ? "[Report Only] " + consoleMessage : consoleMessage;

- m_policy->executionContext()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message);

+ m_policy->executionContext()->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message));

m_policy->reportViolation(directiveText, effectiveDirective, message, blockedURL, m_reportURIs, m_header);

}

void CSPDirectiveList::reportViolationWithLocation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, const String& contextURL, const WTF::OrdinalNumber& contextLine) const

{

String message = m_reportOnly ? "[Report Only] " + consoleMessage : consoleMessage;

- m_policy->executionContext()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt());

+ m_policy->executionContext()->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt()));

m_policy->reportViolation(directiveText, effectiveDirective, message, blockedURL, m_reportURIs, m_header);

}

void CSPDirectiveList::reportViolationWithState(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, ScriptState* scriptState) const

vsevik 2014/08/08 13:06:29 You could simply rename parameter to message.

kozyatinskiy1 2014/08/08 14:58:09 Done.

{

String message = m_reportOnly ? "[Report Only] " + consoleMessage : consoleMessage;

- m_policy->executionContext()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, scriptState);

+ RefPtr<ConsoleMessage> outConsoleMessage = ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message);

+ outConsoleMessage->setScriptState(scriptState);

+ m_policy->executionContext()->addConsoleMessage(outConsoleMessage.release());

m_policy->reportViolation(directiveText, effectiveDirective, message, blockedURL, m_reportURIs, m_header);

}

« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/frame/csp/ContentSecurityPolicy.cpp » ('j') | Source/core/workers/WorkerGlobalScope.cpp » ('J')