diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebKit/chromium/src/WebWorkerClientImpl.cpp | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebKit/chromium/src/WebWorkerClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebWorkerClientImpl.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp b/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp index 18282e3..f90e7e8 100644 --- a/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp +++ b/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp @@ -41,6 +41,7 @@ #include "MessageEvent.h" #include "MessagePort.h" #include "MessagePortChannel.h" +#include "ScriptCallStack.h" #include "ScriptExecutionContext.h" #include "Worker.h" #include "WorkerContext.h" @@ -247,7 +248,7 @@ void WebWorkerClientImpl::postExceptionToWorkerObject(const WebString& errorMess sourceURL, lineNumber)); if (unhandled) - m_scriptExecutionContext->reportException(errorMessage, lineNumber, sourceURL); + m_scriptExecutionContext->reportException(errorMessage, lineNumber, sourceURL, 0); } void WebWorkerClientImpl::postConsoleMessageToWorkerObject(int destination, @@ -274,7 +275,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(int destination, static_cast<MessageType>(messageType), static_cast<MessageLevel>(messageLevel), String(message), lineNumber, - String(sourceURL)); + String(sourceURL), 0); } void WebWorkerClientImpl::postConsoleMessageToWorkerObject(int sourceId, @@ -381,9 +382,7 @@ void WebWorkerClientImpl::postExceptionToWorkerObjectTask( sourceURL, lineNumber)); if (!handled) - thisPtr->m_scriptExecutionContext->reportException(errorMessage, - lineNumber, - sourceURL); + thisPtr->m_scriptExecutionContext->reportException(errorMessage, lineNumber, sourceURL, 0); } void WebWorkerClientImpl::postConsoleMessageToWorkerObjectTask(ScriptExecutionContext* context, @@ -398,8 +397,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObjectTask(ScriptExecutionCo thisPtr->m_scriptExecutionContext->addMessage(static_cast<MessageSource>(sourceId), static_cast<MessageType>(messageType), static_cast<MessageLevel>(messageLevel), - message, lineNumber, - sourceURL); + message, lineNumber, sourceURL, 0); } void WebWorkerClientImpl::confirmMessageFromWorkerObjectTask(ScriptExecutionContext* context, |