Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

1 files changed, 4 insertions, 8 deletions

diff --git a/WebCore/editing/DeleteButton.cpp b/WebCore/editing/DeleteButton.cpp
index 91991cf..7f2fec0 100644
--- a/WebCore/editing/DeleteButton.cpp
+++ b/WebCore/editing/DeleteButton.cpp
@@ -50,14 +50,10 @@ PassRefPtr<DeleteButton> DeleteButton::create(Document* 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);