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

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

Issue 1115353002: Update renderer to layoutObject in core/html. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLOptGroupElement.h ('k') | Source/core/html/HTMLOptionElement.h » ('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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 if (select && select->usesMenuList()) 104 if (select && select->usesMenuList())
105 return false; 105 return false;
106 return HTMLElement::supportsFocus(); 106 return HTMLElement::supportsFocus();
107 } 107 }
108 108
109 void HTMLOptGroupElement::updateNonComputedStyle() 109 void HTMLOptGroupElement::updateNonComputedStyle()
110 { 110 {
111 m_style = originalStyleForLayoutObject(); 111 m_style = originalStyleForLayoutObject();
112 if (layoutObject()) { 112 if (layoutObject()) {
113 if (HTMLSelectElement* select = ownerSelectElement()) 113 if (HTMLSelectElement* select = ownerSelectElement())
114 select->updateListOnRenderer(); 114 select->updateListOnLayoutObject();
115 } 115 }
116 } 116 }
117 117
118 ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const 118 ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const
119 { 119 {
120 return m_style.get(); 120 return m_style.get();
121 } 121 }
122 122
123 PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject() 123 PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject()
124 { 124 {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 label.setTextContent(labelText); 175 label.setTextContent(labelText);
176 label.setAttribute(aria_labelAttr, AtomicString(labelText)); 176 label.setAttribute(aria_labelAttr, AtomicString(labelText));
177 } 177 }
178 178
179 HTMLDivElement& HTMLOptGroupElement::optGroupLabelElement() const 179 HTMLDivElement& HTMLOptGroupElement::optGroupLabelElement() const
180 { 180 {
181 return *toHTMLDivElement(userAgentShadowRoot()->getElementById(ShadowElement Names::optGroupLabel())); 181 return *toHTMLDivElement(userAgentShadowRoot()->getElementById(ShadowElement Names::optGroupLabel()));
182 } 182 }
183 183
184 } // namespace 184 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLOptGroupElement.h ('k') | Source/core/html/HTMLOptionElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698