Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
index 765da87a8896da493e0798b6a11908ce10a3dafc..952a0e1055839cdbdcd6afddb004a31e71ef332a 100644 |
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
@@ -244,6 +244,31 @@ |
namespace blink { |
+namespace { |
+ |
+bool translateConsoleLevel(const WebConsoleMessage::Level level, MessageLevel* webCoreMessageLevel) |
+{ |
+ switch (level) { |
+ case WebConsoleMessage::LevelDebug: |
+ *webCoreMessageLevel = DebugMessageLevel; |
+ break; |
+ case WebConsoleMessage::LevelLog: |
+ *webCoreMessageLevel = LogMessageLevel; |
+ break; |
+ case WebConsoleMessage::LevelWarning: |
+ *webCoreMessageLevel = WarningMessageLevel; |
+ break; |
+ case WebConsoleMessage::LevelError: |
+ *webCoreMessageLevel = ErrorMessageLevel; |
+ break; |
+ default: |
+ return false; |
+ } |
+ return true; |
+} |
+ |
+} // namespace |
+ |
static int frameCount = 0; |
static HeapVector<ScriptSourceCode> createSourcesVector(const WebScriptSource* sourcesIn, unsigned numSources) |
@@ -751,20 +776,7 @@ void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message) |
DCHECK(frame()); |
MessageLevel webCoreMessageLevel; |
- switch (message.level) { |
- case WebConsoleMessage::LevelDebug: |
- webCoreMessageLevel = DebugMessageLevel; |
- break; |
- case WebConsoleMessage::LevelLog: |
- webCoreMessageLevel = LogMessageLevel; |
- break; |
- case WebConsoleMessage::LevelWarning: |
- webCoreMessageLevel = WarningMessageLevel; |
- break; |
- case WebConsoleMessage::LevelError: |
- webCoreMessageLevel = ErrorMessageLevel; |
- break; |
- default: |
+ if (!translateConsoleLevel(message.level, &webCoreMessageLevel)) { |
NOTREACHED(); |
return; |
} |
@@ -772,6 +784,19 @@ void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message) |
frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSource, webCoreMessageLevel, message.text, message.url, message.lineNumber, message.columnNumber)); |
} |
+void WebLocalFrameImpl::addSecurityMessageToConsole(const WebConsoleMessage& message) |
+{ |
+ DCHECK(frame()); |
+ |
+ MessageLevel webCoreMessageLevel; |
+ if (!translateConsoleLevel(message.level, &webCoreMessageLevel)) { |
+ ASSERT_NOT_REACHED(); |
+ return; |
+ } |
+ |
+ frame()->document()->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, webCoreMessageLevel, message.text, message.url, message.lineNumber, message.columnNumber)); |
+} |
+ |
void WebLocalFrameImpl::collectGarbage() |
{ |
if (!frame()) |