Merge 67261 - Make middle clicks not fire DOM onclick events....

WebCore/html/HTMLInputElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2128 matching lines @@
 struct EventHandlingState : FastAllocBase {
     RefPtr<HTMLInputElement> m_currRadio;
     bool m_indeterminate;
     bool m_checked;
     
     EventHandlingState(bool indeterminate, bool checked)
         : m_indeterminate(indeterminate)
         , m_checked(checked) { }
 };
 
-void* HTMLInputElement::preDispatchEventHandler(Event *evt)
+void* HTMLInputElement::preDispatchEventHandler(Event* evt)
 {
     // preventDefault or "return false" are used to reverse the automatic checking/selection we do here.
     // This result gives us enough info to perform the "undo" in postDispatch of the action we take here.
     void* result = 0; 
-    if ((inputType() == CHECKBOX || inputType() == RADIO) && evt->isMouseEvent()
-            && evt->type() == eventNames().clickEvent && static_cast<MouseEvent*>(evt)->button() == LeftButton) {
-        
+    if ((inputType() == CHECKBOX || inputType() == RADIO) && evt->type() == eventNames().clickEvent) {
         OwnPtr<EventHandlingState> state = adoptPtr(new EventHandlingState(indeterminate(), checked()));
-
         if (inputType() == CHECKBOX) {
             if (indeterminate())
                 setIndeterminate(false);
             else
                 setChecked(!checked(), true);
         } else {
             // For radio buttons, store the current selected radio object.
             // We really want radio groups to end up in sane states, i.e., to have something checked.
             // Therefore if nothing is currently selected, we won't allow this action to be "undone", since
             // we want some object in the radio group to actually get selected.
             HTMLInputElement* currRadio = checkedRadioButtons(this).checkedButtonForGroup(name());
             if (currRadio) {
                 // We have a radio button selected that is not us.  Cache it in our result field and ref it so
                 // that it can't be destroyed.
                 state->m_currRadio = currRadio;
             }
             if (indeterminate())
                 setIndeterminate(false);
             setChecked(true, true);
         }
         result = state.leakPtr(); // FIXME: Check whether this actually ends up leaking.
     }
     return result;
 }
 
 void HTMLInputElement::postDispatchEventHandler(Event *evt, void* data)
 {
-    if ((inputType() == CHECKBOX || inputType() == RADIO) && evt->isMouseEvent()
-            && evt->type() == eventNames().clickEvent && static_cast<MouseEvent*>(evt)->button() == LeftButton) {
+    if ((inputType() == CHECKBOX || inputType() == RADIO) && evt->type() == eventNames().clickEvent) {
         
         if (EventHandlingState* state = reinterpret_cast<EventHandlingState*>(data)) {
             if (inputType() == CHECKBOX) {
                 // Reverse the checking we did in preDispatch.
                 if (evt->defaultPrevented() || evt->defaultHandled()) {
                     setIndeterminate(state->m_indeterminate);
                     setChecked(state->m_checked);
                 }
             } else {
                 HTMLInputElement* input = state->m_currRadio.get();
@@ skipping 62 matching lines @@
    if (isTextField()
             && evt->type() == eventNames().keydownEvent
             && evt->isKeyboardEvent()
             && focused()
             && document()->frame()
             && document()->frame()->doTextFieldCommandFromEvent(this, static_cast<KeyboardEvent*>(evt))) {
         evt->setDefaultHandled();
         return;
     }
 
-    if (inputType() == RADIO
-            && evt->isMouseEvent()
-            && evt->type() == eventNames().clickEvent
-            && static_cast<MouseEvent*>(evt)->button() == LeftButton) {
+    if (inputType() == RADIO && evt->type() == eventNames().clickEvent) {
         evt->setDefaultHandled();
         return;
     }
     
     // Call the base event handler before any of our own event handling for almost all events in text fields.
     // Makes editing keyboard handling take precedence over the keydown and keypress handling in this function.
     bool callBaseClassEarly = isTextField() && !implicitSubmission
         && (evt->type() == eventNames().keydownEvent || evt->type() == eventNames().keypressEvent);
     if (callBaseClassEarly) {
         HTMLFormControlElementWithState::defaultEventHandler(evt);
@@ skipping 713 matching lines @@
     case TIME:
     case URL:
     case WEEK:
         return false;
     }
     return false;
 }
 #endif
 
 } // namespace