Move PageConsole to using FrameHost instead of Page

Source/core/page/PageConsole.cpp

 /*
  * Copyright (C) 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/page/PageConsole.h"
 
 #include "core/dom/Document.h"
-#include "core/dom/ScriptableDocumentParser.h"
+#include "core/frame/FrameHost.h"
 #include "core/inspector/ConsoleAPITypes.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
-#include "core/frame/ConsoleBase.h"
 #include "core/page/Page.h"
 #include "wtf/text/StringBuilder.h"
-#include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 namespace {
 
 int muteCount = 0;
 
 }
 
-PageConsole::PageConsole(Page* page)
-    : m_page(page)
+PageConsole::PageConsole(FrameHost& frameHost)
+    : m_frameHost(frameHost)
 {
 }
 
 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message)
 {
     addMessage(source, level, message, String(), 0, 0, 0, 0, 0);
 }
 
 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack)
 {
     addMessage(source, level, message, String(), 0, 0, callStack, 0);
 }
 
 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier)
 {
     if (muteCount && source != ConsoleAPIMessageSource)
         return;
 
-    ExecutionContext* context = m_page->mainFrame()->document();
+    // FIXME: This should not need to reach for the main-frame.
+    // Inspector code should just take the current frame and know how to walk itself.
+    ExecutionContext* context = m_frameHost.page().mainFrame()->document();
     if (!context)
         return;
 
     String messageURL;
     if (callStack) {
         messageURL = callStack->at(0).sourceURL();
         InspectorInstrumentation::addMessageToConsole(context, source, LogMessageType, level, message, callStack, requestIdentifier);
     } else {
         messageURL = url;
         InspectorInstrumentation::addMessageToConsole(context, source, LogMessageType, level, message, url, lineNumber, columnNumber, state, requestIdentifier);
     }
 
     if (source == CSSMessageSource)
         return;
 
     String stackTrace;
-    if (callStack && m_page->chrome().client().shouldReportDetailedMessageForSource(messageURL))
+    if (callStack && m_frameHost.chrome().client().shouldReportDetailedMessageForSource(messageURL))
         stackTrace = PageConsole::formatStackTraceString(message, callStack);
 
-    m_page->chrome().client().addMessageToConsole(source, level, message, lineNumber, messageURL, stackTrace);
+    m_frameHost.chrome().client().addMessageToConsole(source, level, message, lineNumber, messageURL, stackTrace);
 }
 
 String PageConsole::formatStackTraceString(const String& originalMessage, PassRefPtr<ScriptCallStack> callStack)
 {
     StringBuilder stackTrace;
     for (size_t i = 0; i < callStack->size(); ++i) {
         const ScriptCallFrame& frame = callStack->at(i);
         stackTrace.append("\n    at " + (frame.functionName().length() ? frame.functionName() : "(anonymous function)"));
         stackTrace.append(" (");
         stackTrace.append(frame.sourceURL());
@@ skipping 12 matching lines @@
     muteCount++;
 }
 
 void PageConsole::unmute()
 {
     ASSERT(muteCount > 0);
     muteCount--;
 }
 
 } // namespace WebCore