Use upstreamed V8WorkerCustom and V8WorkerContextCustom. Remove duplicate V8Utilities in project.

Review URL: http://codereview.chromium.org/92044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14275 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 537 deletions

diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index e131ce2..63525ac 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -332,6 +332,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8WorkerContextCustom.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8WorkerCustom.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLHttpRequestConstructor.cpp"
 				>
 			</File>
@@ -3089,10 +3097,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\V8WorkerContextCustom.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8WorkerContextEventListener.cpp"
 			>
 		</File>
@@ -3109,18 +3113,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\V8WorkerCustom.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8Utilities.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8Utilities.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\WorkerContextExecutionProxy.cpp"
 			>
 		</File>
diff --git a/webkit/port/bindings/v8/V8WorkerContextCustom.cpp b/webkit/port/bindings/v8/V8WorkerContextCustom.cpp
deleted file mode 100644
index 84aa89a..0000000
--- a/webkit/port/bindings/v8/V8WorkerContextCustom.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright (c) 2009, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "config.h"
-
-#if ENABLE(WORKERS)
-
-#include "v8_binding.h"
-#include "v8_custom.h"
-#include "v8_proxy.h"
-#include "WorkerContextExecutionProxy.h"
-
-#include "ExceptionCode.h"
-#include "MessagePort.h"
-#include "NotImplemented.h"
-#include "V8Document.h"
-#include "V8HTMLDocument.h"
-#include "V8WorkerContextEventListener.h"
-#include "WorkerContext.h"
-
-namespace WebCore {
-
-// TODO(mbelshe) - merge these with XHR's CreateHiddenXHRDependency
-
-// Use an array to hold dependents. It works like a ref-counted scheme.
-// A value can be added more than once to the xhr object.
-static void CreateHiddenDependency(v8::Local<v8::Object> object,
-                                   v8::Local<v8::Value> value) {
-  ASSERT(V8Proxy::GetDOMWrapperType(object) == V8ClassIndex::WORKERCONTEXT);
-  v8::Local<v8::Value> cache =
-      object->GetInternalField(V8Custom::kWorkerContextRequestCacheIndex);
-  if (cache->IsNull() || cache->IsUndefined()) {
-    cache = v8::Array::New();
-    object->SetInternalField(V8Custom::kWorkerContextRequestCacheIndex, cache);
-  }
-
-  v8::Local<v8::Array> cache_array = v8::Local<v8::Array>::Cast(cache);
-  cache_array->Set(v8::Integer::New(cache_array->Length()), value);
-}
-
-static void RemoveHiddenDependency(v8::Local<v8::Object> object,
-                                   v8::Local<v8::Value> value) {
-  ASSERT(V8Proxy::GetDOMWrapperType(object) == V8ClassIndex::WORKERCONTEXT);
-  v8::Local<v8::Value> cache =
-      object->GetInternalField(V8Custom::kWorkerContextRequestCacheIndex);
-  ASSERT(cache->IsArray());
-  v8::Local<v8::Array> cache_array = v8::Local<v8::Array>::Cast(cache);
-  for (int i = cache_array->Length() - 1; i >= 0; i--) {
-    v8::Local<v8::Value> cached = cache_array->Get(v8::Integer::New(i));
-    if (cached->StrictEquals(value)) {
-      cache_array->Delete(i);
-      return;
-    }
-  }
-
-  // We should only get here if we try to remove an event listener that was
-  // never added.
-}
-
-ACCESSOR_GETTER(WorkerContextSelf) {
-  INC_STATS(L"DOM.WorkerContext.self._get");
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, info.Holder());
-  return WorkerContextExecutionProxy::WorkerContextToV8Object(imp);
-}
-
-ACCESSOR_GETTER(WorkerContextOnmessage) {
-  INC_STATS(L"DOM.WorkerContext.onmessage._get");
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, info.Holder());
-  if (imp->onmessage()) {
-    V8WorkerContextEventListener* listener =
-        static_cast<V8WorkerContextEventListener*>(imp->onmessage());
-    v8::Local<v8::Object> v8_listener = listener->getListenerObject();
-    return v8_listener;
-  }
-  return v8::Undefined();
-}
-
-ACCESSOR_SETTER(WorkerContextOnmessage) {
-  INC_STATS(L"DOM.WorkerContext.onmessage._set");
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, info.Holder());
-  V8WorkerContextEventListener* old_listener =
-      static_cast<V8WorkerContextEventListener*>(imp->onmessage());
-  if (value->IsNull()) {
-    if (imp->onmessage()) {
-      v8::Local<v8::Object> old_v8_listener = old_listener->getListenerObject();
-      RemoveHiddenDependency(info.Holder(), old_v8_listener);
-    }
-
-    // Clear the listener
-    imp->setOnmessage(0);
-
-  } else {
-    RefPtr<V8EventListener> listener =
-        imp->script()->proxy()->findOrCreateEventListener(
-            v8::Local<v8::Object>::Cast(value), false, false);
-    if (listener) {
-      if (old_listener) {
-        v8::Local<v8::Object> old_v8_listener =
-            old_listener->getListenerObject();
-        RemoveHiddenDependency(info.Holder(), old_v8_listener);
-      }
-
-      imp->setOnmessage(listener);
-      CreateHiddenDependency(info.Holder(), value);
-    }
-  }
-}
-
-v8::Handle<v8::Value> SetTimeoutOrInterval(const v8::Arguments& args,
-                                           bool singleShot) {
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, args.Holder());
-
-  int delay = ToInt32(args[1]);
-
-  notImplemented();
-
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> ClearTimeoutOrInterval(const v8::Arguments& args) {
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, args.Holder());
-
-  bool ok = false;
-  int tid = ToInt32(args[0], ok);
-  if (ok) {
-    imp->removeTimeout(tid);
-  }
-
-  return v8::Undefined();
-}
-
-CALLBACK_FUNC_DECL(WorkerContextImportScripts) {
-  INC_STATS(L"DOM.WorkerContext.importScripts()");
-  notImplemented();
-  return v8::Undefined();
-}
-
-CALLBACK_FUNC_DECL(WorkerContextSetTimeout) {
-  INC_STATS(L"DOM.WorkerContext.setTimeout()");
-  return SetTimeoutOrInterval(args, true);
-}
-
-CALLBACK_FUNC_DECL(WorkerContextClearTimeout) {
-  INC_STATS(L"DOM.WorkerContext.clearTimeout()");
-  return ClearTimeoutOrInterval(args);
-}
-
-CALLBACK_FUNC_DECL(WorkerContextSetInterval) {
-  INC_STATS(L"DOM.WorkerContext.setInterval()");
-  return SetTimeoutOrInterval(args, false);
-}
-
-CALLBACK_FUNC_DECL(WorkerContextClearInterval) {
-  INC_STATS(L"DOM.WorkerContext.clearInterval()");
-  return ClearTimeoutOrInterval(args);
-}
-
-CALLBACK_FUNC_DECL(WorkerContextAddEventListener) {
-  INC_STATS(L"DOM.WorkerContext.addEventListener()");
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, args.Holder());
-
-  RefPtr<V8EventListener> listener =
-      imp->script()->proxy()->findOrCreateEventListener(
-          v8::Local<v8::Object>::Cast(args[1]), false, false);
-
-  if (listener) {
-    String type = ToWebCoreString(args[0]);
-    bool useCapture = args[2]->BooleanValue();
-    imp->addEventListener(type, listener, useCapture);
-
-    CreateHiddenDependency(args.Holder(), args[1]);
-  }
-  return v8::Undefined();
-}
-
-CALLBACK_FUNC_DECL(WorkerContextRemoveEventListener) {
-  INC_STATS(L"DOM.WorkerContext.removeEventListener()");
-  WorkerContext* imp = V8Proxy::ToNativeObject<WorkerContext>(
-      V8ClassIndex::WORKERCONTEXT, args.Holder());
-  WorkerContextExecutionProxy* proxy = imp->script()->proxy();
-
-  RefPtr<V8EventListener> listener = proxy->findOrCreateEventListener(
-      v8::Local<v8::Object>::Cast(args[1]), false, true);
-
-  if (listener) {
-    String type = ToWebCoreString(args[0]);
-    bool useCapture = args[2]->BooleanValue();
-    imp->removeEventListener(type, listener.get(), useCapture);
-
-    RemoveHiddenDependency(args.Holder(), args[1]);
-  }
-
-  return v8::Undefined();
-}
-
-}  // namespace WebCore
-
-#endif  // ENABLE(WORKERS)
diff --git a/webkit/port/bindings/v8/V8WorkerCustom.cpp b/webkit/port/bindings/v8/V8WorkerCustom.cpp
deleted file mode 100644
index d5c2661..0000000
--- a/webkit/port/bindings/v8/V8WorkerCustom.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright (c) 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "config.h"
-
-#if ENABLE(WORKERS)
-
-#include "v8_binding.h"
-#include "v8_custom.h"
-#include "v8_proxy.h"
-
-#include "ExceptionCode.h"
-#include "Frame.h"
-#include "MessagePort.h"
-#include "V8Document.h"
-#include "V8HTMLDocument.h"
-#include "V8ObjectEventListener.h"
-#include "Worker.h"
-#include "WorkerContext.h"
-#include "WorkerContextExecutionProxy.h"
-
-namespace WebCore {
-
-CALLBACK_FUNC_DECL(WorkerConstructor) {
-  INC_STATS(L"DOM.Worker.Constructor");
-
-  if (!WorkerContextExecutionProxy::isWebWorkersEnabled()) {
-    V8Proxy::ThrowError(V8Proxy::SYNTAX_ERROR, "Worker is not enabled.");
-    return v8::Undefined();
-  }
-
-  if (!args.IsConstructCall()) {
-    V8Proxy::ThrowError(V8Proxy::TYPE_ERROR,
-        "DOM object constructor cannot be called as a function.");
-    return v8::Undefined();
-  }
-
-  if (args.Length() == 0) {
-    V8Proxy::ThrowError(V8Proxy::SYNTAX_ERROR, "Not enough arguments");
-    return v8::Undefined();
-  }
-
-  v8::TryCatch try_catch;
-  v8::Handle<v8::String> script_url = args[0]->ToString();
-  if (try_catch.HasCaught()) {
-    v8::ThrowException(try_catch.Exception());
-    return v8::Undefined();
-  }
-  if (script_url.IsEmpty()) {
-    return v8::Undefined();
-  }
-
-  // Get the script execution context.
-  ScriptExecutionContext* context = 0;
-  WorkerContextExecutionProxy* proxy = WorkerContextExecutionProxy::retrieve();
-  if (proxy)
-    context = proxy->workerContext();
-  else {
-    Frame* frame = V8Proxy::retrieveFrame();
-    if (!frame)
-      return v8::Undefined();
-    context = frame->document();
-  }
-
-  // Create the worker object.
-  // Note: it's OK to let this RefPtr go out of scope because we also call
-  // SetDOMWrapper(), which effectively holds a reference to obj.
-  ExceptionCode ec = 0;
-  RefPtr<Worker> obj = Worker::create(
-      ToWebCoreString(script_url), context, ec);
-
-  // Setup the standard wrapper object internal fields.
-  v8::Handle<v8::Object> wrapper_object = args.Holder();
-  V8Proxy::SetDOMWrapper(
-      wrapper_object, V8ClassIndex::WORKER, obj.get());
-
-  obj->ref();
-  V8Proxy::SetJSWrapperForActiveDOMObject(
-      obj.get(), v8::Persistent<v8::Object>::New(wrapper_object));
-
-  return wrapper_object;
-}
-
-// TODO(mbelshe) - merge these with XHR's CreateHiddenXHRDependency
-
-// Use an array to hold dependents. It works like a ref-counted scheme.
-// A value can be added more than once to the xhr object.
-static void CreateHiddenDependency(v8::Local<v8::Object> object,
-                                   v8::Local<v8::Value> value) {
-  ASSERT(V8Proxy::GetDOMWrapperType(object) ==
-      V8ClassIndex::WORKER);
-  v8::Local<v8::Value> cache =
-      object->GetInternalField(V8Custom::kWorkerRequestCacheIndex);
-  if (cache->IsNull() || cache->IsUndefined()) {
-    cache = v8::Array::New();
-    object->SetInternalField(V8Custom::kWorkerRequestCacheIndex, cache);
-  }
-
-  v8::Local<v8::Array> cache_array = v8::Local<v8::Array>::Cast(cache);
-  cache_array->Set(v8::Integer::New(cache_array->Length()), value);
-}
-
-static void RemoveHiddenDependency(v8::Local<v8::Object> object,
-                                   v8::Local<v8::Value> value) {
-  ASSERT(V8Proxy::GetDOMWrapperType(object) == V8ClassIndex::WORKER);
-  v8::Local<v8::Value> cache =
-      object->GetInternalField(V8Custom::kWorkerRequestCacheIndex);
-  ASSERT(cache->IsArray());
-  v8::Local<v8::Array> cache_array = v8::Local<v8::Array>::Cast(cache);
-  for (int i = cache_array->Length() - 1; i >= 0; i--) {
-    v8::Local<v8::Value> cached = cache_array->Get(v8::Integer::New(i));
-    if (cached->StrictEquals(value)) {
-      cache_array->Delete(i);
-      return;
-    }
-  }
-
-  // We should only get here if we try to remove an event listener that was
-  // never added.
-}
-
-ACCESSOR_GETTER(WorkerOnmessage) {
-  INC_STATS(L"DOM.Worker.onmessage._get");
-  Worker* imp = V8Proxy::ToNativeObject<Worker>(
-      V8ClassIndex::WORKER, info.Holder());
-  if (imp->onmessage()) {
-    V8ObjectEventListener* listener =
-        static_cast<V8ObjectEventListener*>(imp->onmessage());
-    v8::Local<v8::Object> v8_listener = listener->getListenerObject();
-    return v8_listener;
-  }
-  return v8::Undefined();
-}
-
-ACCESSOR_SETTER(WorkerOnmessage) {
-  INC_STATS(L"DOM.Worker.onmessage._set");
-  Worker* imp = V8Proxy::ToNativeObject<Worker>(
-      V8ClassIndex::WORKER, info.Holder());
-  V8ObjectEventListener* old_listener =
-      static_cast<V8ObjectEventListener*>(imp->onmessage());
-  if (value->IsNull()) {
-    if (old_listener) {
-      v8::Local<v8::Object> old_v8_listener = old_listener->getListenerObject();
-      RemoveHiddenDependency(info.Holder(), old_v8_listener);
-    }
-
-    // Clear the listener
-    imp->setOnmessage(0);
-
-  } else {
-    V8Proxy* proxy = V8Proxy::retrieve(imp->scriptExecutionContext());
-    if (!proxy)
-      return;
-
-    RefPtr<EventListener> listener =
-      proxy->FindOrCreateObjectEventListener(value, false);
-    if (listener) {
-      if (old_listener) {
-        v8::Local<v8::Object> old_v8_listener =
-            old_listener->getListenerObject();
-        RemoveHiddenDependency(info.Holder(), old_v8_listener);
-      }
-
-      imp->setOnmessage(listener);
-      CreateHiddenDependency(info.Holder(), value);
-    }
-  }
-}
-
-ACCESSOR_GETTER(WorkerOnerror) {
-  INC_STATS(L"DOM.Worker.onerror._get");
-  Worker* imp = V8Proxy::ToNativeObject<Worker>(
-      V8ClassIndex::WORKER, info.Holder());
-  if (imp->onerror()) {
-    V8ObjectEventListener* listener =
-        static_cast<V8ObjectEventListener*>(imp->onerror());
-    v8::Local<v8::Object> v8_listener = listener->getListenerObject();
-    return v8_listener;
-  }
-  return v8::Undefined();
-}
-
-ACCESSOR_SETTER(WorkerOnerror) {
-  INC_STATS(L"DOM.Worker.onerror._set");
-  Worker* imp = V8Proxy::ToNativeObject<Worker>(
-      V8ClassIndex::WORKER, info.Holder());
-  V8ObjectEventListener* old_listener =
-      static_cast<V8ObjectEventListener*>(imp->onerror());
-  if (value->IsNull()) {
-    if (old_listener) {
-      v8::Local<v8::Object> old_v8_listener =
-          old_listener->getListenerObject();
-      RemoveHiddenDependency(info.Holder(), old_v8_listener);
-    }
-
-    // Clear the listener
-    imp->setOnerror(0);
-  } else {
-    V8Proxy* proxy = V8Proxy::retrieve(imp->scriptExecutionContext());
-    if (!proxy)
-      return;
-
-    RefPtr<EventListener> listener =
-      proxy->FindOrCreateObjectEventListener(value, false);
-    if (listener) {
-      if (old_listener) {
-        v8::Local<v8::Object> old_v8_listener = old_listener->getListenerObject();
-        RemoveHiddenDependency(info.Holder(), old_v8_listener);
-      }
-
-      imp->setOnerror(listener);
-      CreateHiddenDependency(info.Holder(), value);
-    }
-  }
-}
-
-CALLBACK_FUNC_DECL(WorkerAddEventListener) {
-  INC_STATS(L"DOM.Worker.addEventListener()");
-  Worker* imp = V8Proxy::ToNativeObject<Worker>(
-      V8ClassIndex::WORKER, args.Holder());
-
-  V8Proxy* proxy = V8Proxy::retrieve(imp->scriptExecutionContext());
-  if (!proxy)
-    return v8::Undefined();
-
-  RefPtr<EventListener> listener =
-      proxy->FindOrCreateObjectEventListener(args[1], false);
-  if (listener) {
-    String type = ToWebCoreString(args[0]);
-    bool useCapture = args[2]->BooleanValue();
-    imp->addEventListener(type, listener, useCapture);
-
-    CreateHiddenDependency(args.Holder(), args[1]);
-  }
-  return v8::Undefined();
-}
-
-CALLBACK_FUNC_DECL(WorkerRemoveEventListener) {
-  INC_STATS(L"DOM.Worker.removeEventListener()");
-  Worker* imp = V8Proxy::ToNativeObject<Worker>(
-      V8ClassIndex::WORKER, args.Holder());
-
-  V8Proxy* proxy = V8Proxy::retrieve(imp->scriptExecutionContext());
-  if (!proxy)
-    return v8::Undefined();  // probably leaked
-
-  RefPtr<EventListener> listener =
-    proxy->FindObjectEventListener(args[1], false);
-
-  if (listener) {
-    String type = ToWebCoreString(args[0]);
-    bool useCapture = args[2]->BooleanValue();
-    imp->removeEventListener(type, listener.get(), useCapture);
-
-    RemoveHiddenDependency(args.Holder(), args[1]);
-  }
-
-  return v8::Undefined();
-}
-
-}  // namespace WebCore
-
-#endif  // ENABLE(WORKERS)
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index e44efee..c2b438f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1033,6 +1033,8 @@
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8StyleSheetListCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8TreeWalkerCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp',
+        '../third_party/WebKit/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp',
+        '../third_party/WebKit/WebCore/bindings/v8/custom/V8WorkerCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8XMLHttpRequestConstructor.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp',
@@ -1109,8 +1111,6 @@
         'port/bindings/v8/V8CanvasPixelArrayCustom.cpp',
         'port/bindings/v8/V8MessagePortCustom.cpp',
         'port/bindings/v8/V8SVGPODTypeWrapper.h',
-        'port/bindings/v8/V8WorkerContextCustom.cpp',
-        'port/bindings/v8/V8WorkerCustom.cpp',
         'port/bindings/v8/dom_wrapper_map.h',
         'port/bindings/v8/NPV8Object.cpp',
         'port/bindings/v8/NPV8Object.h',