diff options
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/bindings/v8/V8WorkerCustom.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_index.h | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/webkit/port/bindings/v8/V8WorkerCustom.cpp b/webkit/port/bindings/v8/V8WorkerCustom.cpp index 0d44c5a..bdcb803 100644 --- a/webkit/port/bindings/v8/V8WorkerCustom.cpp +++ b/webkit/port/bindings/v8/V8WorkerCustom.cpp @@ -88,7 +88,7 @@ CALLBACK_FUNC_DECL(WorkerConstructor) { wrapper_object, V8ClassIndex::WORKER, obj.get()); obj->ref(); - V8Proxy::SetJSWrapperForDOMObject( + V8Proxy::SetJSWrapperForActiveDOMObject( obj.get(), v8::Persistent<v8::Object>::New(wrapper_object)); return wrapper_object; diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h index f52f984..9e6584f 100644 --- a/webkit/port/bindings/v8/v8_index.h +++ b/webkit/port/bindings/v8/v8_index.h @@ -27,12 +27,15 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #endif #if ENABLE(WORKERS) +#define WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V) \ + V(WORKER, Worker) + #define WORKER_NONNODE_WRAPPER_TYPES(V) \ - V(WORKER, Worker) \ V(WORKERCONTEXT, WorkerContext) \ V(WORKERLOCATION, WorkerLocation) \ V(WORKERNAVIGATOR, WorkerNavigator) #else +#define WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V) #define WORKER_NONNODE_WRAPPER_TYPES(V) #endif @@ -233,7 +236,8 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); // during GC. #define ACTIVE_DOM_OBJECT_TYPES(V) \ V(MESSAGEPORT, MessagePort) \ - V(XMLHTTPREQUEST, XMLHttpRequest) + V(XMLHTTPREQUEST, XMLHttpRequest) \ + WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V) // NOTE: DOM_OBJECT_TYPES is split into two halves because // Visual Studio's Intellinonsense crashes when macros get |