Updating href attribute should not blur.

In HTMLAnchorElement::attributeChanged,

    params.name != hrefAttr && isLink()

should have been

    params.name != hrefAttr || isLink()

This CL fixes it, and improves code readability.

BUG=679669

Review-Url: https://codereview.chromium.org/2623163002
Cr-Commit-Position: refs/heads/master@{#442855}

third_party/WebKit/LayoutTests/fast/dom/HTMLAnchorElement/remove-href-from-focused-anchor-expected.txt → third_party/WebKit/LayoutTests/fast/dom/HTMLAnchorElement/update-href-of-focused-anchor-expected.txt

-PASS document.activeElement is target
 Remove href.
+PASS document.activeElement is target
 PASS document.activeElement is document.body
+Update href.
+PASS document.activeElement is target
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/dom/HTMLAnchorElement/remove-href-from-focused-anchor.html → third_party/WebKit/LayoutTests/fast/dom/HTMLAnchorElement/update-href-of-focused-anchor.html

@@ -5,12 +5,19 @@
 <script>
 jsTestIsAsync = true;
 var target = document.getElementById('target');
-target.focus();
-shouldBe('document.activeElement', 'target');
-debug('Remove href.');
 window.onload = function() {
+    debug('Remove href.');
+    target.focus();
+    shouldBe('document.activeElement', 'target');
     target.removeAttribute('href');
     shouldBe('document.activeElement', 'document.body');
+
+    debug('Update href.');
+    target.href = 'javascript:';
+    target.focus();
+    target.href = 'javascript:undefined';
+    shouldBe('document.activeElement', 'target');
+
     target.remove();
     finishJSTest();
 };

third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp

@@ -256,10 +256,9 @@ void HTMLAnchorElement::attributeChanged(
   HTMLElement::attributeChanged(params);
   if (params.reason != AttributeModificationReason::kDirectly)
     return;
-  if (params.name != hrefAttr && isLink())
-    return;
-  if (adjustedFocusedElementInTreeScope() != this)
+  if (params.name != hrefAttr)
     return;
+  if (!isLink() && adjustedFocusedElementInTreeScope() == this)
     blur();
 }