Merge: chromium side [42671:42725]...

webkit/port/bindings/v8/v8_custom.cpp

 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
  *  Copyright (C) 2004-2006 Apple Computer, Inc.
  *  Copyright (C) 2006 James G. Speth (speth@end.com)
  *  Copyright (C) 2006 Samuel Weinig (sam@webkit.org)
  *  Copyright 2007, 2008 Google Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ skipping 1054 matching lines @@
 
   Document* doc = imp->frame()->document();
   if (!doc)
     return;
 
   String key = ToWebCoreString(name);
   String event_type = EventNameFromAttributeName(key);
 
   if (value->IsNull()) {
     // Clear the event listener
-    imp->clearInlineEventListener(event_type);
+    imp->clearAttributeEventListener(event_type);
   } else {
     V8Proxy* proxy = V8Proxy::retrieve(imp->frame());
     if (!proxy)
       return;
 
     RefPtr<EventListener> listener =
       proxy->FindOrCreateV8EventListener(value, true);
     if (listener) {
-      imp->setInlineEventListener(event_type, listener);
+      imp->setAttributeEventListener(event_type, listener);
     }
   }
 }
 
 
 ACCESSOR_GETTER(DOMWindowEventHandler) {
   v8::Handle<v8::Object> holder = V8Proxy::LookupDOMWrapper(
       V8ClassIndex::DOMWINDOW, info.This());
   if (holder.IsEmpty())
     return v8::Undefined();
 
   DOMWindow* imp = V8Proxy::ToNativeObject<DOMWindow>(
       V8ClassIndex::DOMWINDOW, holder);
   if (!imp->frame())
     return v8::Undefined();
 
   Document* doc = imp->frame()->document();
   if (!doc)
     return v8::Undefined();
 
   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);
 }
 
 
 ACCESSOR_SETTER(ElementEventHandler) {
   Node* node = V8Proxy::DOMWrapperToNode<Node>(info.Holder());
 
   // Name starts with 'on', remove them.
   String key = ToWebCoreString(name);
   ASSERT(key.startsWith("on"));
   String event_type = key.substring(2);
 
   // Set handler if the value is a function.  Otherwise, clear the
   // event handler.
   if (value->IsFunction()) {
     V8Proxy* proxy = V8Proxy::retrieve(node->document()->frame());
     // the document might be created using createDocument,
     // which does not have a frame, use the active frame
     if (!proxy)
       proxy = V8Proxy::retrieve(V8Proxy::retrieveActiveFrame());
     if (!proxy)
       return;
 
     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);
   }
 }
 
 
 ACCESSOR_GETTER(ElementEventHandler) {
   Node* node = V8Proxy::DOMWrapperToNode<Node>(info.Holder());
 
   // Name starts with 'on', remove them.
   String key = ToWebCoreString(name);
   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);
 }
 
 // --------------- Security Checks -------------------------
 NAMED_ACCESS_CHECK(DOMWindow) {
   ASSERT(V8ClassIndex::FromInt(data->Int32Value()) == V8ClassIndex::DOMWINDOW);
   v8::Handle<v8::Value> window =
     V8Proxy::LookupDOMWrapper(V8ClassIndex::DOMWINDOW, host);
   if (window.IsEmpty())
       return false;  // the frame is gone.
@@ skipping 141 matching lines @@
 #undef MAKE_CASE
 
   default:
     return V8ClassIndex::INVALID_CLASS_INDEX;
   }
 }
 
 #endif  // ENABLE(SVG)
 
 }  // namespace WebCore