WebKit merge 41588:41613 (Chromium side).

webkit\port\bindings\v8, webkit\build files
  These are all adjustments to use the recently upstreamed V8Events files.

percent-top-value-with-relative-position-expected
  This is a new test that has the same result in chromium but uses a slightly
  different font to display it, so pixels and coordinates were also different.

search-field-cancel-expected
  This is a new test that verifies the visual aspects of the search field.
  Since chromium doesn't implement this field in a special way, chromium's
  results are expected to be different.

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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/webkit/port/bindings/v8/V8MessagePortCustom.cpp b/webkit/port/bindings/v8/V8MessagePortCustom.cpp
index 63a1ee2..6405b678 100644
--- a/webkit/port/bindings/v8/V8MessagePortCustom.cpp
+++ b/webkit/port/bindings/v8/V8MessagePortCustom.cpp
@@ -32,11 +32,11 @@
 
 #include "v8_binding.h"
 #include "v8_custom.h"
-#include "v8_events.h"
 #include "v8_proxy.h"
 
 #include "V8Document.h"
 #include "V8HTMLDocument.h"
+#include "V8ObjectEventListener.h"
 
 #include "ExceptionCode.h"
 #include "MessagePort.h"
@@ -88,7 +88,7 @@ ACCESSOR_GETTER(MessagePortOnmessage)
     if (messagePort->onmessage()) {
         V8ObjectEventListener* listener =
             static_cast<V8ObjectEventListener*>(messagePort->onmessage());
-        v8::Local<v8::Object> v8Listener = listener->GetListenerObject();
+        v8::Local<v8::Object> v8Listener = listener->getListenerObject();
         return v8Listener;
     }
     return v8::Undefined();
@@ -103,7 +103,7 @@ ACCESSOR_SETTER(MessagePortOnmessage)
         if (messagePort->onmessage()) {
             V8ObjectEventListener* listener =
                 static_cast<V8ObjectEventListener*>(messagePort->onmessage());
-            v8::Local<v8::Object> v8Listener = listener->GetListenerObject();
+            v8::Local<v8::Object> v8Listener = listener->getListenerObject();
             RemoveHiddenDependency(info.Holder(), v8Listener);
         }
 
@@ -132,7 +132,7 @@ ACCESSOR_GETTER(MessagePortOnclose)
     if (messagePort->onclose()) {
         V8ObjectEventListener* listener =
             static_cast<V8ObjectEventListener*>(messagePort->onclose());
-        v8::Local<v8::Object> v8Listener = listener->GetListenerObject();
+        v8::Local<v8::Object> v8Listener = listener->getListenerObject();
         return v8Listener;
     }
     return v8::Undefined();
@@ -147,7 +147,7 @@ ACCESSOR_SETTER(MessagePortOnclose)
         if (messagePort->onclose()) {
             V8ObjectEventListener* listener =
                 static_cast<V8ObjectEventListener*>(messagePort->onclose());
-            v8::Local<v8::Object> v8Listener = listener->GetListenerObject();
+            v8::Local<v8::Object> v8Listener = listener->getListenerObject();
             RemoveHiddenDependency(info.Holder(), v8Listener);
         }