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

WebCore/wml/WMLAElement.cpp

 /**
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
- * Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ skipping 10 matching lines @@
 
 #if ENABLE(WML)
 #include "WMLAElement.h"
 
 #include "Attribute.h"
 #include "Event.h"
 #include "EventHandler.h"
 #include "EventNames.h"
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "HTMLAnchorElement.h"
 #include "HTMLNames.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "RenderBox.h"
 #include "ResourceHandle.h"
 #include "WMLNames.h"
 
 namespace WebCore {
 
 using namespace WMLNames;
@@ skipping 64 matching lines @@
     size_t n = rects.size();
     for (size_t i = 0; i < n; ++i)
         if (!rects[i].isEmpty())
             return true;
 
     return false;
 }
 
 void WMLAElement::defaultEventHandler(Event* event)
 {
-    if (isLink() && (event->type() == eventNames().clickEvent || (event->type() == eventNames().keydownEvent && focused()))) {
-        MouseEvent* e = 0;
-        if (event->type() == eventNames().clickEvent && event->isMouseEvent())
-            e = static_cast<MouseEvent*>(event);
-
-        KeyboardEvent* k = 0;
-        if (event->type() == eventNames().keydownEvent && event->isKeyboardEvent())
-            k = static_cast<KeyboardEvent*>(event);
-
-        if (e && e->button() == RightButton) {
-            WMLElement::defaultEventHandler(event);
-            return;
-        }
-
-        if (k) {
-            if (k->keyIdentifier() != "Enter") {
-                WMLElement::defaultEventHandler(event);
-                return;
-            }
-
+    if (isLink()) {
+        if (focused() && isEnterKeyKeydownEvent(event)) {
             event->setDefaultHandled();
             dispatchSimulatedClick(event);
             return;
         }
- 
-        if (!event->defaultPrevented() && document()->frame()) {
-            KURL url = document()->completeURL(deprecatedParseURL(getAttribute(HTMLNames::hrefAttr)));
-            document()->frame()->loader()->urlSelected(url, target(), event, false, false, true, SendReferrer);
+
+        if (isLinkClick(event)) {
+            handleLinkClick(document(), deprecatedParseURL(getAttribute(HTMLNames::hrefAttr)), target(), event);
+            return;
         }
-
-        event->setDefaultHandled();
     }
 
     WMLElement::defaultEventHandler(event);
 }
 
 void WMLAElement::accessKeyAction(bool sendToAnyElement)
 {
     // send the mouse button events if the caller specified sendToAnyElement
     dispatchSimulatedClick(0, sendToAnyElement);
 }
 
 bool WMLAElement::isURLAttribute(Attribute *attr) const
 {
     return attr->name() == HTMLNames::hrefAttr;
 }
 
 String WMLAElement::target() const
 {
     return getAttribute(HTMLNames::targetAttr);
 }
 
 }
 
 #endif