Fix build break to worker feature due to latest webkit merge.

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

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

4 files changed, 26 insertions, 19 deletions

diff --git a/webkit/port/bindings/v8/V8WorkerContextCustom.cpp b/webkit/port/bindings/v8/V8WorkerContextCustom.cpp
index 14d7b80..e646bb5 100644
--- a/webkit/port/bindings/v8/V8WorkerContextCustom.cpp
+++ b/webkit/port/bindings/v8/V8WorkerContextCustom.cpp
@@ -33,16 +33,15 @@
 
 #include "v8_binding.h"
 #include "v8_custom.h"
-#include "v8_events.h"
 #include "v8_proxy.h"
 #include "WorkerContextExecutionProxy.h"
 
-#include "V8Document.h"
-#include "V8HTMLDocument.h"
-
 #include "ExceptionCode.h"
 #include "MessagePort.h"
 #include "NotImplemented.h"
+#include "V8Document.h"
+#include "V8HTMLDocument.h"
+#include "V8WorkerContextEventListener.h"
 #include "WorkerContext.h"
 
 namespace WebCore {
@@ -98,7 +97,7 @@ ACCESSOR_GETTER(WorkerContextOnmessage) {
   if (imp->onmessage()) {
     V8WorkerContextEventListener* listener =
         static_cast<V8WorkerContextEventListener*>(imp->onmessage());
-    v8::Local<v8::Object> v8_listener = listener->GetListenerObject();
+    v8::Local<v8::Object> v8_listener = listener->getListenerObject();
     return v8_listener;
   }
   return v8::Undefined();
@@ -112,7 +111,7 @@ ACCESSOR_SETTER(WorkerContextOnmessage) {
       static_cast<V8WorkerContextEventListener*>(imp->onmessage());
   if (value->IsNull()) {
     if (imp->onmessage()) {
-      v8::Local<v8::Object> old_v8_listener = old_listener->GetListenerObject();
+      v8::Local<v8::Object> old_v8_listener = old_listener->getListenerObject();
       RemoveHiddenDependency(info.Holder(), old_v8_listener);
     }
 
@@ -126,7 +125,7 @@ ACCESSOR_SETTER(WorkerContextOnmessage) {
     if (listener) {
       if (old_listener) {
         v8::Local<v8::Object> old_v8_listener =
-            old_listener->GetListenerObject();
+            old_listener->getListenerObject();
         RemoveHiddenDependency(info.Holder(), old_v8_listener);
       }
 
@@ -161,6 +160,12 @@ v8::Handle<v8::Value> ClearTimeoutOrInterval(const v8::Arguments& args) {
   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);
diff --git a/webkit/port/bindings/v8/V8WorkerCustom.cpp b/webkit/port/bindings/v8/V8WorkerCustom.cpp
index e1a1d23..7426383 100644
--- a/webkit/port/bindings/v8/V8WorkerCustom.cpp
+++ b/webkit/port/bindings/v8/V8WorkerCustom.cpp
@@ -33,14 +33,14 @@
 
 #include "v8_binding.h"
 #include "v8_custom.h"
-#include "v8_events.h"
 #include "v8_proxy.h"
 
-#include "V8Document.h"
-#include "V8HTMLDocument.h"
-
 #include "ExceptionCode.h"
+#include "Frame.h"
 #include "MessagePort.h"
+#include "V8Document.h"
+#include "V8HTMLDocument.h"
+#include "V8ObjectEventListener.h"
 #include "Worker.h"
 
 namespace WebCore {
@@ -139,7 +139,7 @@ ACCESSOR_GETTER(WorkerOnmessage) {
   if (imp->onmessage()) {
     V8ObjectEventListener* listener =
         static_cast<V8ObjectEventListener*>(imp->onmessage());
-    v8::Local<v8::Object> v8_listener = listener->GetListenerObject();
+    v8::Local<v8::Object> v8_listener = listener->getListenerObject();
     return v8_listener;
   }
   return v8::Undefined();
@@ -153,7 +153,7 @@ ACCESSOR_SETTER(WorkerOnmessage) {
       static_cast<V8ObjectEventListener*>(imp->onmessage());
   if (value->IsNull()) {
     if (old_listener) {
-      v8::Local<v8::Object> old_v8_listener = old_listener->GetListenerObject();
+      v8::Local<v8::Object> old_v8_listener = old_listener->getListenerObject();
       RemoveHiddenDependency(info.Holder(), old_v8_listener);
     }
 
@@ -170,7 +170,7 @@ ACCESSOR_SETTER(WorkerOnmessage) {
     if (listener) {
       if (old_listener) {
         v8::Local<v8::Object> old_v8_listener =
-            old_listener->GetListenerObject();
+            old_listener->getListenerObject();
         RemoveHiddenDependency(info.Holder(), old_v8_listener);
       }
 
@@ -187,7 +187,7 @@ ACCESSOR_GETTER(WorkerOnerror) {
   if (imp->onerror()) {
     V8ObjectEventListener* listener =
         static_cast<V8ObjectEventListener*>(imp->onerror());
-    v8::Local<v8::Object> v8_listener = listener->GetListenerObject();
+    v8::Local<v8::Object> v8_listener = listener->getListenerObject();
     return v8_listener;
   }
   return v8::Undefined();
@@ -202,7 +202,7 @@ ACCESSOR_SETTER(WorkerOnerror) {
   if (value->IsNull()) {
     if (old_listener) {
       v8::Local<v8::Object> old_v8_listener =
-          old_listener->GetListenerObject();
+          old_listener->getListenerObject();
       RemoveHiddenDependency(info.Holder(), old_v8_listener);
     }
 
@@ -217,7 +217,7 @@ ACCESSOR_SETTER(WorkerOnerror) {
       proxy->FindOrCreateObjectEventListener(value, false);
     if (listener) {
       if (old_listener) {
-        v8::Local<v8::Object> old_v8_listener = old_listener->GetListenerObject();
+        v8::Local<v8::Object> old_v8_listener = old_listener->getListenerObject();
         RemoveHiddenDependency(info.Holder(), old_v8_listener);
       }
 
diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
index 06ff389..b9ccf66 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -34,9 +34,10 @@
 #include "WorkerContextExecutionProxy.h"
 
 #include "v8_binding.h"
-#include "v8_events.h"
 #include "v8_index.h"
 #include "v8_proxy.h"
+#include "Event.h"
+#include "V8WorkerContextEventListener.h"
 #include "WorkerContext.h"
 #include "WorkerLocation.h"
 #include "WorkerNavigator.h"
@@ -336,7 +337,7 @@ WorkerContextExecutionProxy::FindOrCreateEventListener(
        iter != m_listeners.end();
        ++iter) {
     V8EventListener* el = *iter;
-    if (el->isInline() == is_inline && el->GetListenerObject() == obj)
+    if (el->isInline() == is_inline && el->getListenerObject() == obj)
       return el;
   }
   if (find_only)
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index c72bd33..2e33fcf 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -477,6 +477,7 @@ DECLARE_CALLBACK(WorkerRemoveEventListener)
 
 DECLARE_PROPERTY_ACCESSOR_GETTER(WorkerContextSelf)
 DECLARE_PROPERTY_ACCESSOR(WorkerContextOnmessage)
+DECLARE_CALLBACK(WorkerContextImportScripts)
 DECLARE_CALLBACK(WorkerContextSetTimeout)
 DECLARE_CALLBACK(WorkerContextClearTimeout)
 DECLARE_CALLBACK(WorkerContextSetInterval)