[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
yael.aharon at nokia.com
yael.aharon at nokia.com
Wed Dec 22 17:49:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4920c9316640979946c2b0f0d54169c2c03dbd1d
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 00:13:33 2010 +0000
Progress and meter elements should take a form in their constructor like any other form control.
https://bugs.webkit.org/show_bug.cgi?id=50195
Reviewed by Darin Adler.
WebCore:
Tests: fast/dom/HTMLMeterElement/meter-element-form.html
fast/dom/HTMLProgressElement/progress-element-form.html
* html/HTMLMeterElement.cpp:
(WebCore::HTMLMeterElement::HTMLMeterElement):
(WebCore::HTMLMeterElement::create):
* html/HTMLMeterElement.h:
* html/HTMLProgressElement.h:
* html/HTMLTagNames.in:
LayoutTests:
* fast/dom/HTMLMeterElement/meter-element-form-expected.txt: Added.
* fast/dom/HTMLMeterElement/meter-element-form.html: Added.
* fast/dom/HTMLProgressElement/progress-element-form-expected.txt: Added.
* fast/dom/HTMLProgressElement/progress-element-form.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72976 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b08dc60..86849c8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-30 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Progress and meter elements should take a form in their constructor like any other form control.
+ https://bugs.webkit.org/show_bug.cgi?id=50195
+
+ * fast/dom/HTMLMeterElement/meter-element-form-expected.txt: Added.
+ * fast/dom/HTMLMeterElement/meter-element-form.html: Added.
+ * fast/dom/HTMLProgressElement/progress-element-form-expected.txt: Added.
+ * fast/dom/HTMLProgressElement/progress-element-form.html: Added.
+
2010-11-30 Tony Chang <tony at chromium.org>
Unreviewed, remove dupe expectation for chromium win drt.
diff --git a/LayoutTests/fast/dom/HTMLMeterElement/meter-element-form-expected.txt b/LayoutTests/fast/dom/HTMLMeterElement/meter-element-form-expected.txt
new file mode 100644
index 0000000..4ba1328
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLMeterElement/meter-element-form-expected.txt
@@ -0,0 +1,3 @@
+
+This test passes if the meter element can find its form.
+PASS
diff --git a/LayoutTests/fast/dom/HTMLMeterElement/meter-element-form.html b/LayoutTests/fast/dom/HTMLMeterElement/meter-element-form.html
new file mode 100644
index 0000000..fed493c
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLMeterElement/meter-element-form.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+
+<body>
+<table><form id=form1>
+<meter id=meter1></meter>
+</form></table>
+<div>This test passes if the meter element can find its form.</div>
+<div id=console>FAIL</div>
+
+<script>
+if (document.getElementById('meter1').form.id == "form1")
+ document.getElementById('console').innerHTML = "PASS";
+</script>
+</body>
+</html>
diff --git a/LayoutTests/fast/dom/HTMLProgressElement/progress-element-form-expected.txt b/LayoutTests/fast/dom/HTMLProgressElement/progress-element-form-expected.txt
new file mode 100644
index 0000000..f077304
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLProgressElement/progress-element-form-expected.txt
@@ -0,0 +1,3 @@
+
+This test passes if the progress element can find its form.
+PASS
diff --git a/LayoutTests/fast/dom/HTMLProgressElement/progress-element-form.html b/LayoutTests/fast/dom/HTMLProgressElement/progress-element-form.html
new file mode 100644
index 0000000..fc2bab1
--- /dev/null
+++ b/LayoutTests/fast/dom/HTMLProgressElement/progress-element-form.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+
+<body>
+<table><form id=form1>
+<progress id=progress1></progress>
+</form></table>
+<div>This test passes if the progress element can find its form.</div>
+<div id=console>FAIL</div>
+
+<script>
+if (document.getElementById('progress1').form.id == "form1")
+ document.getElementById('console').innerHTML = "PASS";
+</script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7e05bc8..ef91384 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-30 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Progress and meter elements should take a form in their constructor like any other form control.
+ https://bugs.webkit.org/show_bug.cgi?id=50195
+
+ Tests: fast/dom/HTMLMeterElement/meter-element-form.html
+ fast/dom/HTMLProgressElement/progress-element-form.html
+
+ * html/HTMLMeterElement.cpp:
+ (WebCore::HTMLMeterElement::HTMLMeterElement):
+ (WebCore::HTMLMeterElement::create):
+ * html/HTMLMeterElement.h:
+ * html/HTMLProgressElement.h:
+ * html/HTMLTagNames.in:
+
2010-11-30 Tony Chang <tony at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/html/HTMLMeterElement.cpp b/WebCore/html/HTMLMeterElement.cpp
index 3de69df..09c5210 100644
--- a/WebCore/html/HTMLMeterElement.cpp
+++ b/WebCore/html/HTMLMeterElement.cpp
@@ -36,17 +36,15 @@ namespace WebCore {
using namespace HTMLNames;
-// FIXME: This constructor should take an explicit form element pointer passed from the
-// parser like the constructors for all the other classes derived from HTMLFormControlElement.
-HTMLMeterElement::HTMLMeterElement(const QualifiedName& tagName, Document* document)
- : HTMLFormControlElement(tagName, document, 0)
+HTMLMeterElement::HTMLMeterElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form)
+ : HTMLFormControlElement(tagName, document, form)
{
ASSERT(hasTagName(meterTag));
}
-PassRefPtr<HTMLMeterElement> HTMLMeterElement::create(const QualifiedName& tagName, Document* document)
+PassRefPtr<HTMLMeterElement> HTMLMeterElement::create(const QualifiedName& tagName, Document* document, HTMLFormElement* form)
{
- return adoptRef(new HTMLMeterElement(tagName, document));
+ return adoptRef(new HTMLMeterElement(tagName, document, form));
}
RenderObject* HTMLMeterElement::createRenderer(RenderArena* arena, RenderStyle*)
diff --git a/WebCore/html/HTMLMeterElement.h b/WebCore/html/HTMLMeterElement.h
index cefad97..dedad6a 100644
--- a/WebCore/html/HTMLMeterElement.h
+++ b/WebCore/html/HTMLMeterElement.h
@@ -28,7 +28,7 @@ namespace WebCore {
class HTMLMeterElement : public HTMLFormControlElement {
public:
- static PassRefPtr<HTMLMeterElement> create(const QualifiedName&, Document*);
+ static PassRefPtr<HTMLMeterElement> create(const QualifiedName&, Document*, HTMLFormElement*);
enum GaugeRegion {
GaugeRegionOptimum,
@@ -56,7 +56,7 @@ public:
GaugeRegion gaugeRegion() const;
private:
- HTMLMeterElement(const QualifiedName&, Document*);
+ HTMLMeterElement(const QualifiedName&, Document*, HTMLFormElement*);
virtual bool recalcWillValidate() const { return false; }
diff --git a/WebCore/html/HTMLProgressElement.h b/WebCore/html/HTMLProgressElement.h
index 7900063..429e9c0 100644
--- a/WebCore/html/HTMLProgressElement.h
+++ b/WebCore/html/HTMLProgressElement.h
@@ -28,7 +28,7 @@ namespace WebCore {
class HTMLProgressElement : public HTMLFormControlElement {
public:
- static PassRefPtr<HTMLProgressElement> create(const QualifiedName&, Document*, HTMLFormElement* = 0);
+ static PassRefPtr<HTMLProgressElement> create(const QualifiedName&, Document*, HTMLFormElement*);
double value() const;
void setValue(double, ExceptionCode&);
diff --git a/WebCore/html/HTMLTagNames.in b/WebCore/html/HTMLTagNames.in
index be2cf90..cd4ebcc 100644
--- a/WebCore/html/HTMLTagNames.in
+++ b/WebCore/html/HTMLTagNames.in
@@ -83,7 +83,7 @@ mark interfaceName=HTMLElement
marquee
menu
meta
-meter interfaceName=HTMLMeterElement, conditional=METER_TAG
+meter interfaceName=HTMLMeterElement, constructorNeedsFormElement, conditional=METER_TAG
nav interfaceName=HTMLElement
nobr interfaceName=HTMLElement
noembed interfaceName=HTMLElement
@@ -98,7 +98,7 @@ p interfaceName=HTMLParagraphElement
param
plaintext interfaceName=HTMLElement
pre
-progress interfaceName=HTMLProgressElement, conditional=PROGRESS_TAG
+progress interfaceName=HTMLProgressElement, constructorNeedsFormElement, conditional=PROGRESS_TAG
q interfaceName=HTMLQuoteElement
rp interfaceName=HTMLElement
rt interfaceName=HTMLElement
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list