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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/HTMLMeterElement.h ('k') | Source/core/html/HTMLOptionElement.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) 2010 Nokia Corporation and/or its subsidiary(-ies). 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 { 48 {
49 } 49 }
50 50
51 PassRefPtrWillBeRawPtr<HTMLMeterElement> HTMLMeterElement::create(Document& docu ment) 51 PassRefPtrWillBeRawPtr<HTMLMeterElement> HTMLMeterElement::create(Document& docu ment)
52 { 52 {
53 RefPtrWillBeRawPtr<HTMLMeterElement> meter = adoptRefWillBeNoop(new HTMLMete rElement(document)); 53 RefPtrWillBeRawPtr<HTMLMeterElement> meter = adoptRefWillBeNoop(new HTMLMete rElement(document));
54 meter->ensureUserAgentShadowRoot(); 54 meter->ensureUserAgentShadowRoot();
55 return meter.release(); 55 return meter.release();
56 } 56 }
57 57
58 RenderObject* HTMLMeterElement::createRenderer(const RenderStyle& style) 58 LayoutObject* HTMLMeterElement::createRenderer(const RenderStyle& style)
59 { 59 {
60 if (hasAuthorShadowRoot() || !LayoutTheme::theme().supportsMeter(style.appea rance())) 60 if (hasAuthorShadowRoot() || !LayoutTheme::theme().supportsMeter(style.appea rance()))
61 return RenderObject::createObject(this, style); 61 return LayoutObject::createObject(this, style);
62
63 return new RenderMeter(this); 62 return new RenderMeter(this);
64 } 63 }
65 64
66 void HTMLMeterElement::parseAttribute(const QualifiedName& name, const AtomicStr ing& value) 65 void HTMLMeterElement::parseAttribute(const QualifiedName& name, const AtomicStr ing& value)
67 { 66 {
68 if (name == valueAttr || name == minAttr || name == maxAttr || name == lowAt tr || name == highAttr || name == optimumAttr) 67 if (name == valueAttr || name == minAttr || name == maxAttr || name == lowAt tr || name == highAttr || name == optimumAttr)
69 didElementStateChange(); 68 didElementStateChange();
70 else 69 else
71 LabelableElement::parseAttribute(name, value); 70 LabelableElement::parseAttribute(name, value);
72 } 71 }
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 m_value->updatePseudo(); 184 m_value->updatePseudo();
186 if (RenderMeter* render = renderMeter()) 185 if (RenderMeter* render = renderMeter())
187 render->updateFromElement(); 186 render->updateFromElement();
188 } 187 }
189 188
190 RenderMeter* HTMLMeterElement::renderMeter() const 189 RenderMeter* HTMLMeterElement::renderMeter() const
191 { 190 {
192 if (renderer() && renderer()->isMeter()) 191 if (renderer() && renderer()->isMeter())
193 return toRenderMeter(renderer()); 192 return toRenderMeter(renderer());
194 193
195 RenderObject* renderObject = userAgentShadowRoot()->firstChild()->renderer() ; 194 LayoutObject* layoutObject = userAgentShadowRoot()->firstChild()->renderer() ;
196 return toRenderMeter(renderObject); 195 return toRenderMeter(layoutObject);
197 } 196 }
198 197
199 void HTMLMeterElement::didAddUserAgentShadowRoot(ShadowRoot& root) 198 void HTMLMeterElement::didAddUserAgentShadowRoot(ShadowRoot& root)
200 { 199 {
201 ASSERT(!m_value); 200 ASSERT(!m_value);
202 201
203 RefPtrWillBeRawPtr<MeterInnerElement> inner = MeterInnerElement::create(docu ment()); 202 RefPtrWillBeRawPtr<MeterInnerElement> inner = MeterInnerElement::create(docu ment());
204 root.appendChild(inner); 203 root.appendChild(inner);
205 204
206 RefPtrWillBeRawPtr<MeterBarElement> bar = MeterBarElement::create(document() ); 205 RefPtrWillBeRawPtr<MeterBarElement> bar = MeterBarElement::create(document() );
207 m_value = MeterValueElement::create(document()); 206 m_value = MeterValueElement::create(document());
208 m_value->setWidthPercentage(0); 207 m_value->setWidthPercentage(0);
209 m_value->updatePseudo(); 208 m_value->updatePseudo();
210 bar->appendChild(m_value); 209 bar->appendChild(m_value);
211 210
212 inner->appendChild(bar); 211 inner->appendChild(bar);
213 } 212 }
214 213
215 void HTMLMeterElement::trace(Visitor* visitor) 214 void HTMLMeterElement::trace(Visitor* visitor)
216 { 215 {
217 visitor->trace(m_value); 216 visitor->trace(m_value);
218 LabelableElement::trace(visitor); 217 LabelableElement::trace(visitor);
219 } 218 }
220 219
221 } // namespace 220 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMeterElement.h ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698