Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / ConsoleMessageStorage.cpp

diff --git a/src/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp b/src/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp
index bb5a1a0..f58db17 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp
+++ b/src/third_party/WebKit/Source/core/inspector/ConsoleMessageStorage.cpp
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 
+#include "core/frame/FrameHost.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
@@ -16,14 +17,14 @@ static const unsigned maxConsoleMessageCount = 1000;
 ConsoleMessageStorage::ConsoleMessageStorage(ExecutionContext* context)
     : m_expiredCount(0)
     , m_context(context)
-    , m_frame(nullptr)
+    , m_frameHost(nullptr)
 {
 }
 
-ConsoleMessageStorage::ConsoleMessageStorage(LocalFrame* frame)
+ConsoleMessageStorage::ConsoleMessageStorage(FrameHost* frameHost)
     : m_expiredCount(0)
     , m_context(nullptr)
-    , m_frame(frame)
+    , m_frameHost(frameHost)
 {
 }
 
@@ -35,7 +36,10 @@ void ConsoleMessageStorage::reportMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>
     if (message->type() == ClearMessageType)
         clear();
 
-    InspectorInstrumentation::addMessageToConsole(executionContext(), message.get());
+    if (m_frameHost)
+        InspectorInstrumentation::addMessageToConsole(m_frameHost, message.get());
+    else
+        InspectorInstrumentation::addMessageToConsole(m_context, message.get());
 
     ASSERT(m_messages.size() <= maxConsoleMessageCount);
     if (m_messages.size() == maxConsoleMessageCount) {
@@ -47,7 +51,10 @@ void ConsoleMessageStorage::reportMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>
 
 void ConsoleMessageStorage::clear()
 {
-    InspectorInstrumentation::consoleMessagesCleared(executionContext());
+    if (m_frameHost)
+        InspectorInstrumentation::consoleMessagesCleared(m_frameHost);
+    else
+        InspectorInstrumentation::consoleMessagesCleared(m_context);
     m_messages.clear();
     m_expiredCount = 0;
 }
@@ -89,16 +96,11 @@ int ConsoleMessageStorage::expiredCount() const
     return m_expiredCount;
 }
 
-ExecutionContext* ConsoleMessageStorage::executionContext() const
-{
-    return m_frame ? m_frame->document() : m_context;
-}
-
 void ConsoleMessageStorage::trace(Visitor* visitor)
 {
     visitor->trace(m_messages);
     visitor->trace(m_context);
-    visitor->trace(m_frame);
+    visitor->trace(m_frameHost);
 }
 
 } // namespace blink