- Revision
- 135249
- Author
- shin...@chromium.org
- Date
- 2012-11-19 21:49:45 -0800 (Mon, 19 Nov 2012)
Log Message
[Refactoring] Remove shadowPseudoId() and use setPseudo() in <progress> ElementShadow.
https://bugs.webkit.org/show_bug.cgi?id=101703
Reviewed by Hajime Morita.
Source/WebCore:
We're migrating shadowPseudoId() to pseudo(). We remove shadowPseudoId() from HTMLKeygenElement and use
setPseudo()/pseudo() instead.
No new tests, simple refactoring.
* html/shadow/ProgressShadowElement.cpp:
(WebCore::ProgressInnerElement::ProgressInnerElement):
* html/shadow/ProgressShadowElement.h:
(ProgressInnerElement):
(WebCore::ProgressBarElement::ProgressBarElement):
(ProgressBarElement):
(WebCore::ProgressValueElement::ProgressValueElement):
LayoutTests:
* editing/style/apply-style-atomic-expected.txt:
* fast/dom/HTMLProgressElement/progress-element-markup-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (135248 => 135249)
--- trunk/LayoutTests/ChangeLog 2012-11-20 05:38:00 UTC (rev 135248)
+++ trunk/LayoutTests/ChangeLog 2012-11-20 05:49:45 UTC (rev 135249)
@@ -1,3 +1,13 @@
+2012-11-19 Shinya Kawanaka <shin...@chromium.org>
+
+ [Refactoring] Remove shadowPseudoId() and use setPseudo() in <progress> ElementShadow.
+ https://bugs.webkit.org/show_bug.cgi?id=101703
+
+ Reviewed by Hajime Morita.
+
+ * editing/style/apply-style-atomic-expected.txt:
+ * fast/dom/HTMLProgressElement/progress-element-markup-expected.txt:
+
2012-11-19 Yury Semikhatsky <yu...@chromium.org>
Unreviewed. Reenable webaudio/biquad-getFrequencyResponse.html test as it should pass after r129418
Modified: trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt (135248 => 135249)
--- trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt 2012-11-20 05:38:00 UTC (rev 135248)
+++ trunk/LayoutTests/editing/style/apply-style-atomic-expected.txt 2012-11-20 05:49:45 UTC (rev 135249)
@@ -8,10 +8,13 @@
| "2"
| <shadow:root>
| <div>
+| pseudo="-webkit-progress-inner-element"
| shadow:pseudoId="-webkit-progress-inner-element"
| <div>
+| pseudo="-webkit-progress-bar"
| shadow:pseudoId="-webkit-progress-bar"
| <div>
+| pseudo="-webkit-progress-value"
| style="width: -100%;"
| shadow:pseudoId="-webkit-progress-value"
| <#selection-focus>
Modified: trunk/LayoutTests/fast/dom/HTMLProgressElement/progress-element-markup-expected.txt (135248 => 135249)
--- trunk/LayoutTests/fast/dom/HTMLProgressElement/progress-element-markup-expected.txt 2012-11-20 05:38:00 UTC (rev 135248)
+++ trunk/LayoutTests/fast/dom/HTMLProgressElement/progress-element-markup-expected.txt 2012-11-20 05:49:45 UTC (rev 135249)
@@ -6,9 +6,12 @@
| value="70"
| <shadow:root>
| <div>
+| pseudo="-webkit-progress-inner-element"
| shadow:pseudoId="-webkit-progress-inner-element"
| <div>
+| pseudo="-webkit-progress-bar"
| shadow:pseudoId="-webkit-progress-bar"
| <div>
+| pseudo="-webkit-progress-value"
| style="width: 70%;"
| shadow:pseudoId="-webkit-progress-value"
Modified: trunk/Source/WebCore/ChangeLog (135248 => 135249)
--- trunk/Source/WebCore/ChangeLog 2012-11-20 05:38:00 UTC (rev 135248)
+++ trunk/Source/WebCore/ChangeLog 2012-11-20 05:49:45 UTC (rev 135249)
@@ -1,3 +1,23 @@
+2012-11-19 Shinya Kawanaka <shin...@chromium.org>
+
+ [Refactoring] Remove shadowPseudoId() and use setPseudo() in <progress> ElementShadow.
+ https://bugs.webkit.org/show_bug.cgi?id=101703
+
+ Reviewed by Hajime Morita.
+
+ We're migrating shadowPseudoId() to pseudo(). We remove shadowPseudoId() from HTMLKeygenElement and use
+ setPseudo()/pseudo() instead.
+
+ No new tests, simple refactoring.
+
+ * html/shadow/ProgressShadowElement.cpp:
+ (WebCore::ProgressInnerElement::ProgressInnerElement):
+ * html/shadow/ProgressShadowElement.h:
+ (ProgressInnerElement):
+ (WebCore::ProgressBarElement::ProgressBarElement):
+ (ProgressBarElement):
+ (WebCore::ProgressValueElement::ProgressValueElement):
+
2012-11-19 Yury Semikhatsky <yu...@chromium.org>
Unreviewed. Fix Chromium Debug compilation after r135230.
Modified: trunk/Source/WebCore/html/shadow/ProgressShadowElement.cpp (135248 => 135249)
--- trunk/Source/WebCore/html/shadow/ProgressShadowElement.cpp 2012-11-20 05:38:00 UTC (rev 135248)
+++ trunk/Source/WebCore/html/shadow/ProgressShadowElement.cpp 2012-11-20 05:49:45 UTC (rev 135249)
@@ -58,7 +58,9 @@
ProgressInnerElement::ProgressInnerElement(Document* document)
: ProgressShadowElement(document)
-{
+{
+ DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-progress-inner-element", AtomicString::ConstructFromLiteral));
+ setPseudo(pseudoId);
}
PassRefPtr<ProgressInnerElement> ProgressInnerElement::create(Document* document)
@@ -66,12 +68,6 @@
return adoptRef(new ProgressInnerElement(document));
}
-const AtomicString& ProgressInnerElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-inner-element", AtomicString::ConstructFromLiteral));
- return pseudId;
-}
-
RenderObject* ProgressInnerElement::createRenderer(RenderArena* arena, RenderStyle*)
{
return new (arena) RenderProgress(this);
@@ -86,19 +82,6 @@
return progressRenderer && !progressRenderer->style()->hasAppearance() && HTMLDivElement::rendererIsNeeded(context);
}
-const AtomicString& ProgressBarElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-bar", AtomicString::ConstructFromLiteral));
- return pseudId;
-}
-
-
-const AtomicString& ProgressValueElement::shadowPseudoId() const
-{
- DEFINE_STATIC_LOCAL(AtomicString, pseudId, ("-webkit-progress-value", AtomicString::ConstructFromLiteral));
- return pseudId;
-}
-
void ProgressValueElement::setWidthPercentage(double width)
{
setInlineStyleProperty(CSSPropertyWidth, width, CSSPrimitiveValue::CSS_PERCENTAGE);
Modified: trunk/Source/WebCore/html/shadow/ProgressShadowElement.h (135248 => 135249)
--- trunk/Source/WebCore/html/shadow/ProgressShadowElement.h 2012-11-20 05:38:00 UTC (rev 135248)
+++ trunk/Source/WebCore/html/shadow/ProgressShadowElement.h 2012-11-20 05:49:45 UTC (rev 135249)
@@ -56,7 +56,6 @@
static PassRefPtr<ProgressInnerElement> create(Document*);
private:
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
- virtual const AtomicString& shadowPseudoId() const;
virtual bool rendererIsNeeded(const NodeRenderingContext&);
};
@@ -65,10 +64,11 @@
ProgressBarElement(Document* document)
: ProgressShadowElement(document)
{
+ DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-progress-bar", AtomicString::ConstructFromLiteral));
+ setPseudo(pseudoId);
}
static PassRefPtr<ProgressBarElement> create(Document*);
- virtual const AtomicString& shadowPseudoId() const;
};
inline PassRefPtr<ProgressBarElement> ProgressBarElement::create(Document* document)
@@ -81,9 +81,10 @@
ProgressValueElement(Document* document)
: ProgressShadowElement(document)
{
+ DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-progress-value", AtomicString::ConstructFromLiteral));
+ setPseudo(pseudoId);
}
- virtual const AtomicString& shadowPseudoId() const;
static PassRefPtr<ProgressValueElement> create(Document*);
void setWidthPercentage(double);
};
