Chromium Code Reviews| 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 83e913c1cda36c0faedecbcbe96c51febe5a3975..5581922aae5be4c6d05a89c126511293e1893d71 100644 |
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
| @@ -750,7 +750,41 @@ void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message) |
| { |
| DCHECK(frame()); |
| - MessageLevel webCoreMessageLevel; |
| + MessageSource webCoreMessageSource = OtherMessageSource; |
|
pfeldman
2016/04/21 21:48:30
You have static assert, you should be fine casting
carlosk
2016/04/22 14:33:55
This code was fully removed.
|
| + switch (message.source) { |
| + case WebConsoleMessage::Source::XML: |
| + webCoreMessageSource = XMLMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::JS: |
| + webCoreMessageSource = JSMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::Network: |
| + webCoreMessageSource = NetworkMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::ConsoleAPI: |
| + webCoreMessageSource = ConsoleAPIMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::Storage: |
| + webCoreMessageSource = StorageMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::AppCache: |
| + webCoreMessageSource = AppCacheMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::Rendering: |
| + webCoreMessageSource = RenderingMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::Security: |
| + webCoreMessageSource = SecurityMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::Other: |
| + webCoreMessageSource = OtherMessageSource; |
| + break; |
| + case WebConsoleMessage::Source::Deprecation: |
| + webCoreMessageSource = DeprecationMessageSource; |
| + break; |
| + } |
| + |
| + MessageLevel webCoreMessageLevel = LogMessageLevel; |
| switch (message.level) { |
| case WebConsoleMessage::LevelDebug: |
| webCoreMessageLevel = DebugMessageLevel; |
| @@ -764,12 +798,13 @@ void WebLocalFrameImpl::addMessageToConsole(const WebConsoleMessage& message) |
| case WebConsoleMessage::LevelError: |
| webCoreMessageLevel = ErrorMessageLevel; |
| break; |
| - default: |
| - NOTREACHED(); |
| - return; |
| + // Unsupported values. |
| + case WebConsoleMessage::LevelInfo: |
| + case WebConsoleMessage::LevelRevokedError: |
| + break; |
| } |
| - frame()->document()->addConsoleMessage(ConsoleMessage::create(OtherMessageSource, webCoreMessageLevel, message.text, message.url, message.lineNumber, message.columnNumber)); |
| + frame()->document()->addConsoleMessage(ConsoleMessage::create(webCoreMessageSource, webCoreMessageLevel, message.text, message.url, message.lineNumber, message.columnNumber)); |
| } |
| void WebLocalFrameImpl::collectGarbage() |