diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/workers/WorkerConsole.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/workers/WorkerConsole.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/chromium/third_party/WebKit/Source/core/workers/WorkerConsole.cpp b/chromium/third_party/WebKit/Source/core/workers/WorkerConsole.cpp index e3b34b924cf..f4a819e4dd0 100644 --- a/chromium/third_party/WebKit/Source/core/workers/WorkerConsole.cpp +++ b/chromium/third_party/WebKit/Source/core/workers/WorkerConsole.cpp @@ -31,22 +31,11 @@ #include "core/workers/WorkerConsole.h" -#include "bindings/v8/ScriptCallStackFactory.h" -#include "bindings/v8/ScriptProfiler.h" -#include "core/inspector/ConsoleAPITypes.h" -#include "core/inspector/InspectorConsoleInstrumentation.h" -#include "core/inspector/ScriptArguments.h" #include "core/inspector/ScriptCallStack.h" -#include "core/inspector/ScriptProfile.h" -#include "core/inspector/WorkerInspectorController.h" -#include "core/page/ConsoleBase.h" -#include "core/page/ConsoleTypes.h" -#include "core/platform/chromium/TraceEvent.h" #include "core/workers/WorkerGlobalScope.h" #include "core/workers/WorkerReportingProxy.h" #include "core/workers/WorkerThread.h" -#include "wtf/text/WTFString.h" namespace WebCore { @@ -63,22 +52,16 @@ WorkerConsole::~WorkerConsole() void WorkerConsole::reportMessageToClient(MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack) { const ScriptCallFrame& lastCaller = callStack->at(0); - m_scope->thread()->workerReportingProxy().postConsoleMessageToWorkerObject(ConsoleAPIMessageSource, level, message, lastCaller.lineNumber(), lastCaller.sourceURL()); + m_scope->thread()->workerReportingProxy().reportConsoleMessage(ConsoleAPIMessageSource, level, message, lastCaller.lineNumber(), lastCaller.sourceURL()); } -ScriptExecutionContext* WorkerConsole::context() +ExecutionContext* WorkerConsole::context() { if (!m_scope) return 0; - return m_scope->scriptExecutionContext(); -} - -bool WorkerConsole::profilerEnabled() -{ - return InspectorInstrumentation::profilerEnabled(m_scope); + return m_scope->executionContext(); } // FIXME: add memory getter } // namespace WebCore - |