| Index: Source/core/workers/WorkerGlobalScope.h
|
| diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h
|
| index 1324e74dc69aa330e91734a9c5fafa6e4b9b1406..cdc190c12f0cebf0769cb30afdd67129d2ae2e26 100644
|
| --- a/Source/core/workers/WorkerGlobalScope.h
|
| +++ b/Source/core/workers/WorkerGlobalScope.h
|
| @@ -142,8 +142,8 @@ namespace WebCore {
|
| WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType);
|
|
|
| - virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE;
|
| - void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>, ScriptState*);
|
| + virtual void logExceptionToConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE;
|
| + void addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>);
|
|
|
| private:
|
| #if !ENABLE(OILPAN)
|
| @@ -155,7 +155,7 @@ namespace WebCore {
|
| virtual KURL virtualCompleteURL(const String&) const OVERRIDE FINAL;
|
|
|
| virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE FINAL;
|
| - virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState* = 0) OVERRIDE FINAL;
|
| + virtual void addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE FINAL;
|
|
|
| virtual EventTarget* errorEventTarget() OVERRIDE FINAL;
|
| virtual void didUpdateSecurityOrigin() OVERRIDE FINAL { }
|
|
|