diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/html/HTMLAreaElement.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/html/HTMLAreaElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLAreaElement.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/WebCore/html/HTMLAreaElement.cpp b/WebCore/html/HTMLAreaElement.cpp index 3547cd9..0155bce 100644 --- a/WebCore/html/HTMLAreaElement.cpp +++ b/WebCore/html/HTMLAreaElement.cpp @@ -174,12 +174,17 @@ HTMLImageElement* HTMLAreaElement::imageElement() const bool HTMLAreaElement::isKeyboardFocusable(KeyboardEvent*) const { - return supportsFocus(); + return isFocusable(); +} + +bool HTMLAreaElement::isMouseFocusable() const +{ + return isFocusable(); } bool HTMLAreaElement::isFocusable() const { - return supportsFocus(); + return supportsFocus() && Element::tabIndex() >= 0; } void HTMLAreaElement::dispatchBlurEvent() @@ -192,7 +197,10 @@ void HTMLAreaElement::dispatchBlurEvent() void HTMLAreaElement::updateFocusAppearance(bool restorePreviousSelection) { - Node* parent = parentNode(); + if (!isFocusable()) + return; + + ContainerNode* parent = parentNode(); if (!parent || !parent->hasTagName(mapTag)) return; |