diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-06 18:46:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 15:41:50 +0100 |
| commit | 574543de6f562b52e4e06c8b493c76dea160473f (patch) | |
| tree | 81081d3fe58b5c432e7637f6f5454398150a8c07 /Source/WebCore/bindings | |
| parent | 0d60bcd000865d49c38ca619815d4cd7b2afc87a (diff) | |
| download | external_webkit-574543de6f562b52e4e06c8b493c76dea160473f.zip external_webkit-574543de6f562b52e4e06c8b493c76dea160473f.tar.gz external_webkit-574543de6f562b52e4e06c8b493c76dea160473f.tar.bz2 | |
Merge WebKit at r74325: Build fix.
Cherry pick of upstream patch http://trac.webkit.org/changeset/87424
Change-Id: I6546831e7cecf11bbfd194f0620c56f293b56f2d
Diffstat (limited to 'Source/WebCore/bindings')
| -rw-r--r-- | Source/WebCore/bindings/v8/V8AbstractEventListener.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/bindings/v8/V8DOMWrapper.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/bindings/v8/V8AbstractEventListener.cpp b/Source/WebCore/bindings/v8/V8AbstractEventListener.cpp index f1102c2..90dc097 100644 --- a/Source/WebCore/bindings/v8/V8AbstractEventListener.cpp +++ b/Source/WebCore/bindings/v8/V8AbstractEventListener.cpp @@ -156,8 +156,10 @@ void V8AbstractEventListener::invokeEventHandler(ScriptExecutionContext* context event->target()->uncaughtExceptionInEventHandler(); if (!tryCatch.CanContinue()) { // Result of TerminateExecution(). +#if ENABLE(WORKERS) if (context->isWorkerContext()) static_cast<WorkerContext*>(context)->script()->forbidExecution(); +#endif return; } tryCatch.Reset(); diff --git a/Source/WebCore/bindings/v8/V8DOMWrapper.cpp b/Source/WebCore/bindings/v8/V8DOMWrapper.cpp index bef28a2..249ca7c 100644 --- a/Source/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/Source/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -252,7 +252,9 @@ static bool globalObjectPrototypeIsDOMWindow(v8::Handle<v8::Object> objectProtot v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, WrapperTypeInfo* type, void* impl) { +#if ENABLE(WORKERS) WorkerContext* workerContext = 0; +#endif if (V8IsolatedContext::getEntered()) { // This effectively disables the wrapper cache for isolated worlds. proxy = 0; |