| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "core/html/shadow/MeterShadowElement.h" | 33 #include "core/html/shadow/MeterShadowElement.h" |
| 34 | 34 |
| 35 #include "core/CSSPropertyNames.h" | 35 #include "core/CSSPropertyNames.h" |
| 36 #include "core/HTMLNames.h" | 36 #include "core/HTMLNames.h" |
| 37 #include "core/html/HTMLMeterElement.h" | 37 #include "core/html/HTMLMeterElement.h" |
| 38 #include "core/layout/LayoutMeter.h" |
| 38 #include "core/layout/LayoutTheme.h" | 39 #include "core/layout/LayoutTheme.h" |
| 39 #include "core/rendering/RenderMeter.h" | |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 using namespace HTMLNames; | 43 using namespace HTMLNames; |
| 44 | 44 |
| 45 inline MeterShadowElement::MeterShadowElement(Document& document) | 45 inline MeterShadowElement::MeterShadowElement(Document& document) |
| 46 : HTMLDivElement(document) | 46 : HTMLDivElement(document) |
| 47 { | 47 { |
| 48 } | 48 } |
| 49 | 49 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 74 { | 74 { |
| 75 if (meterElement()->hasOpenShadowRoot()) | 75 if (meterElement()->hasOpenShadowRoot()) |
| 76 return HTMLDivElement::rendererIsNeeded(style); | 76 return HTMLDivElement::rendererIsNeeded(style); |
| 77 | 77 |
| 78 LayoutObject* renderer = meterElement()->renderer(); | 78 LayoutObject* renderer = meterElement()->renderer(); |
| 79 return renderer && !LayoutTheme::theme().supportsMeter(renderer->style()->ap
pearance()) && HTMLDivElement::rendererIsNeeded(style); | 79 return renderer && !LayoutTheme::theme().supportsMeter(renderer->style()->ap
pearance()) && HTMLDivElement::rendererIsNeeded(style); |
| 80 } | 80 } |
| 81 | 81 |
| 82 LayoutObject* MeterInnerElement::createRenderer(const LayoutStyle&) | 82 LayoutObject* MeterInnerElement::createRenderer(const LayoutStyle&) |
| 83 { | 83 { |
| 84 return new RenderMeter(this); | 84 return new LayoutMeter(this); |
| 85 } | 85 } |
| 86 | 86 |
| 87 inline MeterBarElement::MeterBarElement(Document& document) | 87 inline MeterBarElement::MeterBarElement(Document& document) |
| 88 : MeterShadowElement(document) | 88 : MeterShadowElement(document) |
| 89 { | 89 { |
| 90 } | 90 } |
| 91 | 91 |
| 92 PassRefPtrWillBeRawPtr<MeterBarElement> MeterBarElement::create(Document& docume
nt) | 92 PassRefPtrWillBeRawPtr<MeterBarElement> MeterBarElement::create(Document& docume
nt) |
| 93 { | 93 { |
| 94 RefPtrWillBeRawPtr<MeterBarElement> element = adoptRefWillBeNoop(new MeterBa
rElement(document)); | 94 RefPtrWillBeRawPtr<MeterBarElement> element = adoptRefWillBeNoop(new MeterBa
rElement(document)); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 return optimumPseudoId; | 130 return optimumPseudoId; |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 | 133 |
| 134 void MeterValueElement::setWidthPercentage(double width) | 134 void MeterValueElement::setWidthPercentage(double width) |
| 135 { | 135 { |
| 136 setInlineStyleProperty(CSSPropertyWidth, width, CSSPrimitiveValue::CSS_PERCE
NTAGE); | 136 setInlineStyleProperty(CSSPropertyWidth, width, CSSPrimitiveValue::CSS_PERCE
NTAGE); |
| 137 } | 137 } |
| 138 | 138 |
| 139 } | 139 } |
| OLD | NEW |