Index: Source/core/loader/FrameLoader.cpp |
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp |
index 27b19c0ddf4e4f3bbde7e22c0c29bfa30660965b..846d34fbd997b8bd2c944e76610223a499b0eab5 100644 |
--- a/Source/core/loader/FrameLoader.cpp |
+++ b/Source/core/loader/FrameLoader.cpp |
@@ -57,6 +57,7 @@ |
#include "core/html/HTMLFormElement.h" |
#include "core/html/HTMLFrameOwnerElement.h" |
#include "core/html/parser/HTMLParserIdioms.h" |
+#include "core/inspector/ConsoleMessage.h" |
#include "core/inspector/InspectorController.h" |
#include "core/inspector/InspectorInstrumentation.h" |
#include "core/loader/DocumentLoadTiming.h" |
@@ -767,7 +768,7 @@ void FrameLoader::reportLocalLoadFailed(LocalFrame* frame, const String& url) |
if (!frame) |
return; |
- frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url); |
+ frame->document()->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url)); |
} |
// static |
@@ -1363,10 +1364,10 @@ bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, con |
case XFrameOptionsAllowAll: |
return false; |
case XFrameOptionsConflict: |
- m_frame->document()->addConsoleMessageWithRequestIdentifier(JSMessageSource, ErrorMessageLevel, "Multiple 'X-Frame-Options' headers with conflicting values ('" + content + "') encountered when loading '" + url.elidedString() + "'. Falling back to 'DENY'.", requestIdentifier); |
+ m_frame->document()->addConsoleMessageWithRequestIdentifier(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, "Multiple 'X-Frame-Options' headers with conflicting values ('" + content + "') encountered when loading '" + url.elidedString() + "'. Falling back to 'DENY'.", requestIdentifier)); |
return true; |
case XFrameOptionsInvalid: |
- m_frame->document()->addConsoleMessageWithRequestIdentifier(JSMessageSource, ErrorMessageLevel, "Invalid 'X-Frame-Options' header encountered when loading '" + url.elidedString() + "': '" + content + "' is not a recognized directive. The header will be ignored.", requestIdentifier); |
+ m_frame->document()->addConsoleMessageWithRequestIdentifier(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, "Invalid 'X-Frame-Options' header encountered when loading '" + url.elidedString() + "': '" + content + "' is not a recognized directive. The header will be ignored.", requestIdentifier)); |
return false; |
default: |
ASSERT_NOT_REACHED(); |