Remove dependency on the DevTools agent for console logs.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 226 matching lines @@
 #include "web/WebFrameWidgetImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/HashMap.h"
 #include <algorithm>
 
 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)
 {
     HeapVector<ScriptSourceCode> sources;
     sources.append(sourcesIn, numSources);
     return sources;
 }
 
 WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromFrame(LocalFrame* frame)
@@ skipping 487 matching lines @@
 {
     DCHECK(frame());
     DOMWrapperWorld::setIsolatedWorldHumanReadableName(worldID, humanReadableName);
 }
 
 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;
     }
 
     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())
         return;
     if (!frame()->settings()->scriptEnabled())
         return;
     V8GCController::collectGarbage(v8::Isolate::GetCurrent());
 }
 
 v8::Local<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
@@ skipping 1345 matching lines @@
         return WebSandboxFlags::None;
     return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags());
 }
 
 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
 {
     frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
 }
 
 } // namespace blink