Changeset 50638 in webkit

Timestamp:

Nov 8, 2009 10:00:02 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-08 Drew Wilson <​atwilson@chromium.org>

Reviewed by Dimitri Glazkov.

V8 WorkerContextExecutionProxy does not handle SharedWorkers
​https://bugs.webkit.org/show_bug.cgi?id=31226

Now checks to see what type of context is active and creates the
appropriate wrapper (DEDICATEDWORKERCONTEXT vs SHAREDWORKERCONTEXT).

Added support for converting to SharedWorkers and SharedWorkerContexts.

Test: Existing layout tests cover this case (start passing in Chrome).

• bindings/v8/WorkerContextExecutionProxy.cpp: (WebCore::WorkerContextExecutionProxy::initContextIfNeeded): Now generates the right type of DOMWrapper for SharedWorkerContexts. (WebCore::WorkerContextExecutionProxy::convertToV8Object): Added support for SHAREDWORKERCONTEXT. (WebCore::WorkerContextExecutionProxy::convertEventTargetToV8Object): Added support for SharedWorker and SharedWorkerContext.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/WorkerContextExecutionProxy.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-08  Drew Wilson  <atwilson@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        V8 WorkerContextExecutionProxy does not handle SharedWorkers
+        https://bugs.webkit.org/show_bug.cgi?id=31226
+
+        Now checks to see what type of context is active and creates the
+        appropriate wrapper (DEDICATEDWORKERCONTEXT vs SHAREDWORKERCONTEXT).
+
+        Added support for converting to SharedWorkers and SharedWorkerContexts.
+
+        Test: Existing layout tests cover this case (start passing in Chrome).
+
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::initContextIfNeeded):
+        Now generates the right type of DOMWrapper for SharedWorkerContexts.
+        (WebCore::WorkerContextExecutionProxy::convertToV8Object):
+        Added support for SHAREDWORKERCONTEXT.
+        (WebCore::WorkerContextExecutionProxy::convertEventTargetToV8Object):
+        Added support for SharedWorker and SharedWorkerContext.
+
 2009-11-08  Johnny Ding  <johnnyding.webkit@gmail.com>
 

trunk/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp

@@ -151 +151 @@
 
     // Create a new JS object and use it as the prototype for the shadow global object.
-    v8::Handle<v8::Function> workerContextConstructor = V8DOMWrapper::getConstructorForContext(V8ClassIndex::DEDICATEDWORKERCONTEXT, context);
+    V8ClassIndex::V8WrapperType contextType = m_workerContext->isDedicatedWorkerContext() ? V8ClassIndex::DEDICATEDWORKERCONTEXT : V8ClassIndex::SHAREDWORKERCONTEXT;
+    v8::Handle<v8::Function> workerContextConstructor = V8DOMWrapper::getConstructorForContext(contextType, context);
     v8::Local<v8::Object> jsWorkerContext = SafeAllocation::newInstance(workerContextConstructor);
     // Bail out if allocation failed.
@@ -160 +161 @@
 
     // Wrap the object.
-    V8DOMWrapper::setDOMWrapper(jsWorkerContext, V8ClassIndex::ToInt(V8ClassIndex::DEDICATEDWORKERCONTEXT), m_workerContext);
+    V8DOMWrapper::setDOMWrapper(jsWorkerContext, V8ClassIndex::ToInt(contextType), m_workerContext);
 
     V8DOMWrapper::setJSWrapperForDOMObject(m_workerContext, v8::Persistent<v8::Object>::New(jsWorkerContext));
@@ -175 +176 @@
         return v8::Null();
 
-    if (type == V8ClassIndex::DEDICATEDWORKERCONTEXT)
+    if (type == V8ClassIndex::DEDICATEDWORKERCONTEXT || type == V8ClassIndex::SHAREDWORKERCONTEXT)
         return convertWorkerContextToV8Object(static_cast<WorkerContext*>(impl));
 
@@ -287 +288 @@
         return convertWorkerContextToV8Object(workerContext);
 
+    SharedWorkerContext* sharedWorkerContext = target->toSharedWorkerContext();
+    if (sharedWorkerContext)
+        return convertWorkerContextToV8Object(sharedWorkerContext);
+
     Worker* worker = target->toWorker();
     if (worker)
         return convertToV8Object(V8ClassIndex::WORKER, worker);
+
+    SharedWorker* sharedWorker = target->toSharedWorker();
+    if (sharedWorker)
+        return convertToV8Object(V8ClassIndex::SHAREDWORKER, sharedWorker);
 
     XMLHttpRequest* xhr = target->toXMLHttpRequest();