Merge: chromium side [42671:42725]

Rebaselines:

http://trac.webkit.org/changeset/42722 resulted in
  LayoutTests/editing/inserting/insert-3907422-fix.html
  LayoutTests/editing/pasteboard/paste-text-015.html
  LayoutTests/editing/style/font-family-with-space.html


http://trac.webkit.org/changeset/42723 resulted in
  LayoutTests/editing/selection/select-all-iframe.html
  LayoutTests/svg/custom/pointer-events-path.svg

http://trac.webkit.org/changeset/42716 resulted in
  LayoutTests/fast/dom/HTMLSelectElement/named-options.html

http://trac.webkit.org/changeset/42725
Broke the close event behavior and resulted in disabling these ui tests:
 * BrowserCloseBeforeUnloadOK and  
 * BrowserCloseBeforeUnloadCancel


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

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

1 files changed, 6 insertions, 6 deletions

diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index e887cb8..1faf33d 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -1072,7 +1072,7 @@ ACCESSOR_SETTER(DOMWindowEventHandler) {
 
   if (value->IsNull()) {
     // Clear the event listener
-    imp->clearInlineEventListener(event_type);
+    imp->clearAttributeEventListener(event_type);
   } else {
     V8Proxy* proxy = V8Proxy::retrieve(imp->frame());
     if (!proxy)
@@ -1081,7 +1081,7 @@ ACCESSOR_SETTER(DOMWindowEventHandler) {
     RefPtr<EventListener> listener =
       proxy->FindOrCreateV8EventListener(value, true);
     if (listener) {
-      imp->setInlineEventListener(event_type, listener);
+      imp->setAttributeEventListener(event_type, listener);
     }
   }
 }
@@ -1105,7 +1105,7 @@ ACCESSOR_GETTER(DOMWindowEventHandler) {
   String key = ToWebCoreString(name);
   String event_type = EventNameFromAttributeName(key);
 
-  EventListener* listener = imp->getInlineEventListener(event_type);
+  EventListener* listener = imp->getAttributeEventListener(event_type);
   return V8Proxy::EventListenerToV8Object(listener);
 }
 
@@ -1132,10 +1132,10 @@ ACCESSOR_SETTER(ElementEventHandler) {
     RefPtr<EventListener> listener =
       proxy->FindOrCreateV8EventListener(value, true);
     if (listener) {
-      node->setInlineEventListener(event_type, listener);
+      node->setAttributeEventListener(event_type, listener);
     }
   } else {
-    node->clearInlineEventListener(event_type);
+    node->clearAttributeEventListener(event_type);
   }
 }
 
@@ -1148,7 +1148,7 @@ ACCESSOR_GETTER(ElementEventHandler) {
   ASSERT(key.startsWith("on"));
   String event_type = key.substring(2);
 
-  EventListener* listener = node->getInlineEventListener(event_type);
+  EventListener* listener = node->getAttributeEventListener(event_type);
   return V8Proxy::EventListenerToV8Object(listener);
 }