Merge 67246 - 2010-09-109 Peter Kasting <pkasting@google.com>...

WebCore/editing/DeleteButton.cpp

 /*
  * Copyright (C) 2006, 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 32 matching lines @@
 {
 }
 
 PassRefPtr<DeleteButton> DeleteButton::create(Document* document)
 {
     return adoptRef(new DeleteButton(document));
 }
 
 void DeleteButton::defaultEventHandler(Event* event)
 {
-    // FIXME: Is it really import to check the type of the event?
-    // Seems OK to respond to any event named click even if it does not have the correct type.
-    if (event->isMouseEvent()) {
-        if (event->type() == eventNames().clickEvent) {
-            document()->frame()->editor()->deleteButtonController()->deleteTarget();
-            event->setDefaultHandled();
-            // FIXME: Shouldn't we return here instead of falling through?
-        }
+    if (event->type() == eventNames().clickEvent) {
+        document()->frame()->editor()->deleteButtonController()->deleteTarget();
+        event->setDefaultHandled();
+        return;
     }
 
     HTMLImageElement::defaultEventHandler(event);
 }
 
 } // namespace