Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: Source/core/html/HTMLLabelElement.cpp

Issue 1064543002: Set hovered state of current Hovered node even if it is also common ancestor of oldHovered node and (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Incorporated review comments Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 return nullptr; 79 return nullptr;
80 } 80 }
81 81
82 HTMLFormElement* HTMLLabelElement::formOwner() const 82 HTMLFormElement* HTMLLabelElement::formOwner() const
83 { 83 {
84 return FormAssociatedElement::form(); 84 return FormAssociatedElement::form();
85 } 85 }
86 86
87 void HTMLLabelElement::setActive(bool down) 87 void HTMLLabelElement::setActive(bool down)
88 { 88 {
89 if (down == active()) 89 if (down != active()) {
90 return; 90 // Update our status first.
91 91 HTMLElement::setActive(down);
92 // Update our status first. 92 }
93 HTMLElement::setActive(down);
94 93
95 // Also update our corresponding control. 94 // Also update our corresponding control.
96 if (HTMLElement* element = control()) 95 HTMLElement* controlElement = control();
97 element->setActive(down); 96 if (controlElement && controlElement->active() != active())
97 controlElement->setActive(active());
98 } 98 }
99 99
100 void HTMLLabelElement::setHovered(bool over) 100 void HTMLLabelElement::setHovered(bool over)
101 { 101 {
102 if (over == hovered()) 102 if (over != hovered()) {
103 return; 103 // Update our status first.
104 104 HTMLElement::setHovered(over);
105 // Update our status first. 105 }
106 HTMLElement::setHovered(over);
107 106
108 // Also update our corresponding control. 107 // Also update our corresponding control.
109 if (HTMLElement* element = control()) 108 HTMLElement* element = control();
110 element->setHovered(over); 109 if (element && element->hovered() != hovered())
110 element->setHovered(hovered());
111 } 111 }
112 112
113 bool HTMLLabelElement::isInteractiveContent() const 113 bool HTMLLabelElement::isInteractiveContent() const
114 { 114 {
115 return true; 115 return true;
116 } 116 }
117 117
118 bool HTMLLabelElement::isInInteractiveContent(Node* node) const 118 bool HTMLLabelElement::isInInteractiveContent(Node* node) const
119 { 119 {
120 if (!containsIncludingShadowDOM(node)) 120 if (!containsIncludingShadowDOM(node))
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const AtomicString& attributeValue) 283 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const AtomicString& attributeValue)
284 { 284 {
285 if (attributeName == formAttr) 285 if (attributeName == formAttr)
286 formAttributeChanged(); 286 formAttributeChanged();
287 else 287 else
288 HTMLElement::parseAttribute(attributeName, attributeValue); 288 HTMLElement::parseAttribute(attributeName, attributeValue);
289 } 289 }
290 290
291 } // namespace 291 } // namespace
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698