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

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

Issue 67473002: Have ElementTraversal / NodeTraversal's next() methods take a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase on master Created 7 years, 1 month 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/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLLegendElement.cpp » ('j') | 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 64
65 LabelableElement* HTMLLabelElement::control() 65 LabelableElement* HTMLLabelElement::control()
66 { 66 {
67 const AtomicString& controlId = getAttribute(forAttr); 67 const AtomicString& controlId = getAttribute(forAttr);
68 if (controlId.isNull()) { 68 if (controlId.isNull()) {
69 // Search the children and descendants of the label element for a form e lement. 69 // Search the children and descendants of the label element for a form e lement.
70 // per http://dev.w3.org/html5/spec/Overview.html#the-label-element 70 // per http://dev.w3.org/html5/spec/Overview.html#the-label-element
71 // the form element must be "labelable form-associated element". 71 // the form element must be "labelable form-associated element".
72 Element* element = this; 72 Element* element = this;
73 while ((element = ElementTraversal::next(element, this))) { 73 while ((element = ElementTraversal::next(*element, this))) {
74 if (!supportsLabels(element)) 74 if (!supportsLabels(element))
75 continue; 75 continue;
76 return toLabelableElement(element); 76 return toLabelableElement(element);
77 } 77 }
78 return 0; 78 return 0;
79 } 79 }
80 80
81 if (Element* element = treeScope().getElementById(controlId)) { 81 if (Element* element = treeScope().getElementById(controlId)) {
82 if (supportsLabels(element)) 82 if (supportsLabels(element))
83 return toLabelableElement(element); 83 return toLabelableElement(element);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 185
186 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents) 186 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents)
187 { 187 {
188 if (HTMLElement* element = control()) 188 if (HTMLElement* element = control())
189 element->accessKeyAction(sendMouseEvents); 189 element->accessKeyAction(sendMouseEvents);
190 else 190 else
191 HTMLElement::accessKeyAction(sendMouseEvents); 191 HTMLElement::accessKeyAction(sendMouseEvents);
192 } 192 }
193 193
194 } // namespace 194 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLLegendElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698