| 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 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 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/ProgressShadowElement.h" | 33 #include "core/html/shadow/ProgressShadowElement.h" |
| 34 | 34 |
| 35 #include "core/HTMLNames.h" | 35 #include "core/HTMLNames.h" |
| 36 #include "core/html/HTMLProgressElement.h" | 36 #include "core/html/HTMLProgressElement.h" |
| 37 #include "core/rendering/RenderProgress.h" | 37 #include "core/layout/LayoutProgress.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 using namespace HTMLNames; | 41 using namespace HTMLNames; |
| 42 | 42 |
| 43 ProgressShadowElement::ProgressShadowElement(Document& document) | 43 ProgressShadowElement::ProgressShadowElement(Document& document) |
| 44 : HTMLDivElement(document) | 44 : HTMLDivElement(document) |
| 45 { | 45 { |
| 46 } | 46 } |
| 47 | 47 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 58 | 58 |
| 59 inline ProgressInnerElement::ProgressInnerElement(Document& document) | 59 inline ProgressInnerElement::ProgressInnerElement(Document& document) |
| 60 : ProgressShadowElement(document) | 60 : ProgressShadowElement(document) |
| 61 { | 61 { |
| 62 } | 62 } |
| 63 | 63 |
| 64 DEFINE_NODE_FACTORY(ProgressInnerElement) | 64 DEFINE_NODE_FACTORY(ProgressInnerElement) |
| 65 | 65 |
| 66 LayoutObject* ProgressInnerElement::createRenderer(const LayoutStyle&) | 66 LayoutObject* ProgressInnerElement::createRenderer(const LayoutStyle&) |
| 67 { | 67 { |
| 68 return new RenderProgress(this); | 68 return new LayoutProgress(this); |
| 69 } | 69 } |
| 70 | 70 |
| 71 bool ProgressInnerElement::rendererIsNeeded(const LayoutStyle& style) | 71 bool ProgressInnerElement::rendererIsNeeded(const LayoutStyle& style) |
| 72 { | 72 { |
| 73 if (progressElement()->hasOpenShadowRoot()) | 73 if (progressElement()->hasOpenShadowRoot()) |
| 74 return HTMLDivElement::rendererIsNeeded(style); | 74 return HTMLDivElement::rendererIsNeeded(style); |
| 75 | 75 |
| 76 LayoutObject* progressRenderer = progressElement()->renderer(); | 76 LayoutObject* progressRenderer = progressElement()->renderer(); |
| 77 return progressRenderer && !progressRenderer->style()->hasAppearance() && HT
MLDivElement::rendererIsNeeded(style); | 77 return progressRenderer && !progressRenderer->style()->hasAppearance() && HT
MLDivElement::rendererIsNeeded(style); |
| 78 } | 78 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 90 } | 90 } |
| 91 | 91 |
| 92 void ProgressValueElement::setWidthPercentage(double width) | 92 void ProgressValueElement::setWidthPercentage(double width) |
| 93 { | 93 { |
| 94 setInlineStyleProperty(CSSPropertyWidth, width, CSSPrimitiveValue::CSS_PERCE
NTAGE); | 94 setInlineStyleProperty(CSSPropertyWidth, width, CSSPrimitiveValue::CSS_PERCE
NTAGE); |
| 95 } | 95 } |
| 96 | 96 |
| 97 DEFINE_NODE_FACTORY(ProgressValueElement) | 97 DEFINE_NODE_FACTORY(ProgressValueElement) |
| 98 | 98 |
| 99 } | 99 } |
| OLD | NEW |