Changeset 56112 in webkit

Timestamp:

Mar 17, 2010 8:24:24 AM (14 years ago)

Author:

steveblock@google.com

Message:

2010-03-17 Steve Block <​steveblock@google.com>

Reviewed by Dimitri Glazkov.

Adds ENABLE(WORKERS) guards to V8 bindings
​https://bugs.webkit.org/show_bug.cgi?id=36221

Build fix only, no new tests.

• bindings/v8/V8DOMWrapper.cpp: (WebCore::V8DOMWrapper::instantiateV8Object):
• bindings/v8/V8Proxy.cpp: (WebCore::toV8Context):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8DOMWrapper.cpp (modified) (3 diffs)
• bindings/v8/V8Proxy.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-17  Steve Block  <steveblock@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Adds ENABLE(WORKERS) guards to V8 bindings
+        https://bugs.webkit.org/show_bug.cgi?id=36221
+
+        Build fix only, no new tests.
+
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::instantiateV8Object):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::toV8Context):
+
 2010-03-17  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/bindings/v8/V8DOMWrapper.cpp

@@ -199 +199 @@
 }
 
+#if ENABLE(WORKERS)
 v8::Local<v8::Function> V8DOMWrapper::getConstructor(WrapperTypeInfo* type, WorkerContext*)
 {
@@ -211 +212 @@
     return getConstructorForContext(type, context);
 }
+#endif
 
 void V8DOMWrapper::setHiddenWindowReference(Frame* frame, const int internalIndex, v8::Handle<v8::Object> jsObject)
@@ -282 +284 @@
             if (globalObjectPrototypeIsDOMWindow(globalPrototype))
                 proxy = V8Proxy::retrieve(V8DOMWindow::toNative(globalPrototype)->frame());
+#if ENABLE(WORKERS)
             else
                 workerContext = V8WorkerContext::toNative(lookupDOMWrapper(V8WorkerContext::GetTemplate(), context->Global()));
+#endif
         }
     }

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -888 +888 @@
         if (V8Proxy* proxy = V8Proxy::retrieve(context))
             return worldContext.adjustedContext(proxy);
+#if ENABLE(WORKERS)
     } else if (context->isWorkerContext()) {
         if (WorkerContextExecutionProxy* proxy = static_cast<WorkerContext*>(context)->script()->proxy())
             return proxy->context();
+#endif
     }
     return v8::Local<v8::Context>();