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

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

Issue 801283003: Regression: Add back support for hr elements in select listbox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/html.css ('k') | Source/core/html/HTMLSelectElement.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, 2008, 2010 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserv ed.
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 DEFINE_STATIC_LOCAL(AtomicString, labelMinHeight, ("1.2em", AtomicString::Co nstructFromLiteral)); 149 DEFINE_STATIC_LOCAL(AtomicString, labelMinHeight, ("1.2em", AtomicString::Co nstructFromLiteral));
150 RefPtrWillBeRawPtr<HTMLDivElement> label = HTMLDivElement::create(document() ); 150 RefPtrWillBeRawPtr<HTMLDivElement> label = HTMLDivElement::create(document() );
151 label->setAttribute(roleAttr, AtomicString("group", AtomicString::ConstructF romLiteral)); 151 label->setAttribute(roleAttr, AtomicString("group", AtomicString::ConstructF romLiteral));
152 label->setAttribute(aria_labelAttr, AtomicString()); 152 label->setAttribute(aria_labelAttr, AtomicString());
153 label->setInlineStyleProperty(CSSPropertyPadding, labelPadding); 153 label->setInlineStyleProperty(CSSPropertyPadding, labelPadding);
154 label->setInlineStyleProperty(CSSPropertyMinHeight, labelMinHeight); 154 label->setInlineStyleProperty(CSSPropertyMinHeight, labelMinHeight);
155 label->setIdAttribute(ShadowElementNames::optGroupLabel()); 155 label->setIdAttribute(ShadowElementNames::optGroupLabel());
156 root.appendChild(label); 156 root.appendChild(label);
157 157
158 RefPtrWillBeRawPtr<HTMLContentElement> content = HTMLContentElement::create( document()); 158 RefPtrWillBeRawPtr<HTMLContentElement> content = HTMLContentElement::create( document());
159 content->setAttribute(selectAttr, "option,optgroup"); 159 content->setAttribute(selectAttr, "option,optgroup,hr");
160 root.appendChild(content); 160 root.appendChild(content);
161 } 161 }
162 162
163 void HTMLOptGroupElement::updateGroupLabel() 163 void HTMLOptGroupElement::updateGroupLabel()
164 { 164 {
165 const String& labelText = groupLabelText(); 165 const String& labelText = groupLabelText();
166 HTMLDivElement& label = optGroupLabelElement(); 166 HTMLDivElement& label = optGroupLabelElement();
167 label.setTextContent(labelText); 167 label.setTextContent(labelText);
168 label.setAttribute(aria_labelAttr, AtomicString(labelText)); 168 label.setAttribute(aria_labelAttr, AtomicString(labelText));
169 } 169 }
170 170
171 HTMLDivElement& HTMLOptGroupElement::optGroupLabelElement() const 171 HTMLDivElement& HTMLOptGroupElement::optGroupLabelElement() const
172 { 172 {
173 return *toHTMLDivElement(userAgentShadowRoot()->getElementById(ShadowElement Names::optGroupLabel())); 173 return *toHTMLDivElement(userAgentShadowRoot()->getElementById(ShadowElement Names::optGroupLabel()));
174 } 174 }
175 175
176 } // namespace 176 } // namespace
OLDNEW
« no previous file with comments | « Source/core/css/html.css ('k') | Source/core/html/HTMLSelectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698