Avoid branching in createAttributeEventListener

Source/bindings/v8/ScriptEventListener.cpp

 /*
  * 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
@@ skipping 26 matching lines @@
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8WindowShell.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentParser.h"
 #include "core/events/EventListener.h"
 #include "core/frame/LocalFrame.h"
 #include <v8.h>
 
 namespace WebCore {
 
-static const AtomicString& eventParameterName(bool isSVGEvent)
-{
-    DEFINE_STATIC_LOCAL(const AtomicString, eventString, ("event"));
-    DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
-    return isSVGEvent ? evtString : eventString;
-}
-
-PassRefPtr<V8LazyEventListener> createAttributeEventListener(Node* node, const QualifiedName& name, const AtomicString& value)
+PassRefPtr<V8LazyEventListener> createAttributeEventListener(Node* node, const QualifiedName& name, const AtomicString& value, const AtomicString& eventParameterName)
 {
     ASSERT(node);
     if (value.isNull())
         return nullptr;
 
     // FIXME: Very strange: we initialize zero-based number with '1'.
     TextPosition position(OrdinalNumber::fromZeroBasedInt(1), OrdinalNumber::first());
     String sourceURL;
 
     v8::Isolate* isolate;
     if (LocalFrame* frame = node->document().frame()) {
         isolate = toIsolate(frame);
         ScriptController& scriptController = frame->script();
         if (!scriptController.canExecuteScripts(AboutToExecuteScript))
             return nullptr;
         position = scriptController.eventHandlerPosition();
         sourceURL = node->document().url().string();
     } else {
         isolate = v8::Isolate::GetCurrent();
     }
 
-    return V8LazyEventListener::create(name.localName(), eventParameterName(node->isSVGElement()), value, sourceURL, position, node, isolate);
+    return V8LazyEventListener::create(name.localName(), eventParameterName, value, sourceURL, position, node, isolate);
 }
 
-PassRefPtr<V8LazyEventListener> createAttributeEventListener(LocalFrame* frame, const QualifiedName& name, const AtomicString& value)
+PassRefPtr<V8LazyEventListener> createAttributeEventListener(LocalFrame* frame, const QualifiedName& name, const AtomicString& value, const AtomicString& eventParameterName)
 {
     if (!frame)
         return nullptr;
 
     if (value.isNull())
         return nullptr;
 
     ScriptController& scriptController = frame->script();
     if (!scriptController.canExecuteScripts(AboutToExecuteScript))
         return nullptr;
 
     TextPosition position = scriptController.eventHandlerPosition();
     String sourceURL = frame->document()->url().string();
 
-    return V8LazyEventListener::create(name.localName(), eventParameterName(frame->document()->isSVGDocument()), value, sourceURL, position, 0, toIsolate(frame));
+    return V8LazyEventListener::create(name.localName(), eventParameterName, value, sourceURL, position, 0, toIsolate(frame));
 }
 
 static v8::Handle<v8::Function> eventListenerEffectiveFunction(v8::Isolate* isolate, v8::Handle<v8::Object> listenerObject)
 {
     v8::Handle<v8::Function> function;
     if (listenerObject->IsFunction()) {
         function = v8::Handle<v8::Function>::Cast(listenerObject);
     } else if (listenerObject->IsObject()) {
         // Try the "handleEvent" method (EventListener interface).
         v8::Handle<v8::Value> property = listenerObject->Get(v8AtomicString(isolate, "handleEvent"));
@@ skipping 74 matching lines @@
     v8::ScriptOrigin origin = originalFunction->GetScriptOrigin();
     if (!origin.ResourceName().IsEmpty() && origin.ResourceName()->IsString())
         sourceName = toCoreString(origin.ResourceName().As<v8::String>());
     else
         sourceName = "";
     lineNumber = originalFunction->GetScriptLineNumber();
     return true;
 }
 
 } // namespace WebCore