Commit be0cbb48 authored by staikos@webkit.org's avatar staikos@webkit.org

2009-04-18 Nikolas Zimmermann <nikolas.zimmermann@torchmobile.com>

        Reviewed by George Staikos.

        Make WML work again, most regressions test were failing.



git-svn-id: svn://svn.chromium.org/blink/trunk@42639 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c63e1b9e
2009-04-18 Nikolas Zimmermann <nikolas.zimmermann@torchmobile.com>
Reviewed by George Staikos.
Update fast/wml/fieldset.wml layout test result, as RenderLegend is gone.
* platform/mac/fast/wml/fieldset-expected.txt: Rename 'RenderLegend' to 'RenderBlock'.
2009-04-17 Oliver Hunt <oliver@apple.com> 2009-04-17 Oliver Hunt <oliver@apple.com>
Reviewed by Darin Adler. Reviewed by Darin Adler.
......
...@@ -5,7 +5,7 @@ layer at (0,0) size 800x103 ...@@ -5,7 +5,7 @@ layer at (0,0) size 800x103
RenderBlock {card} at (8,16) size 784x71 RenderBlock {card} at (8,16) size 784x71
RenderBlock {p} at (0,0) size 784x71 RenderBlock {p} at (0,0) size 784x71
RenderFieldSet {fieldset} at (2,0) size 780x71 [border: (2px groove #C0C0C0)] RenderFieldSet {fieldset} at (2,0) size 780x71 [border: (2px groove #C0C0C0)]
RenderLegend {insertedLegend} at (14,0) size 42x18 RenderBlock {insertedLegend} at (14,0) size 42x18
RenderText {#text} at (2,0) size 38x18 RenderText {#text} at (2,0) size 38x18
text run at (2,0) width 38: "Name" text run at (2,0) width 38: "Name"
RenderBlock (anonymous) at (14,23) size 752x36 RenderBlock (anonymous) at (14,23) size 752x36
......
2009-04-18 Nikolas Zimmermann <nikolas.zimmermann@torchmobile.com>
Reviewed by George Staikos.
Make WML work again, most regressions test were failing.
* dom/Document.cpp: Be sure to create WML elements in WML namespace. Otherwhise hasTagName() comparisions fail.
(WebCore::Document::createElement):
* wml/WMLCardElement.cpp: Add ASSERT(hasTagName(cardTag)) to catch errors like this in future.
(WebCore::WMLCardElement::WMLCardElement):
* wml/WMLTagNames.in: Wrap comment in #if 0/#endif blocks, to silence the generation script.
2009-04-17 Justin Garcia <justin.garcia@apple.com> 2009-04-17 Justin Garcia <justin.garcia@apple.com>
Reviewed by Dan Bernstein. Reviewed by Dan Bernstein.
...@@ -768,14 +768,19 @@ PassRefPtr<Element> Document::createElement(const QualifiedName& qName, bool cre ...@@ -768,14 +768,19 @@ PassRefPtr<Element> Document::createElement(const QualifiedName& qName, bool cre
e = SVGElementFactory::createSVGElement(qName, this, createdByParser); e = SVGElementFactory::createSVGElement(qName, this, createdByParser);
#endif #endif
#if ENABLE(WML) #if ENABLE(WML)
else if (qName.namespaceURI() == WMLNames::wmlNamespaceURI || isWMLDocument()) else if (qName.namespaceURI() == WMLNames::wmlNamespaceURI)
e = WMLElementFactory::createWMLElement(qName, this, createdByParser); e = WMLElementFactory::createWMLElement(qName, this, createdByParser);
else if (isWMLDocument())
e = WMLElementFactory::createWMLElement(QualifiedName(nullAtom, qName.localName(), WMLNames::wmlNamespaceURI), this, createdByParser);
#endif #endif
if (!e) if (!e)
e = new Element(qName, document()); e = new Element(qName, document());
// <image> uses imgTag so we need a special rule. // <image> uses imgTag so we need a special rule.
#if ENABLE(WML)
if (!isWMLDocument())
#endif
ASSERT((qName.matches(imageTag) && e->tagQName().matches(imgTag) && e->tagQName().prefix() == qName.prefix()) || qName == e->tagQName()); ASSERT((qName.matches(imageTag) && e->tagQName().matches(imgTag) && e->tagQName().prefix() == qName.prefix()) || qName == e->tagQName());
return e.release(); return e.release();
......
...@@ -48,6 +48,7 @@ WMLCardElement::WMLCardElement(const QualifiedName& tagName, Document* doc) ...@@ -48,6 +48,7 @@ WMLCardElement::WMLCardElement(const QualifiedName& tagName, Document* doc)
, m_eventTimer(0) , m_eventTimer(0)
, m_template(0) , m_template(0)
{ {
ASSERT(hasTagName(cardTag));
} }
WMLCardElement::~WMLCardElement() WMLCardElement::~WMLCardElement()
......
...@@ -13,7 +13,9 @@ go ...@@ -13,7 +13,9 @@ go
head interfaceName=WMLElement head interfaceName=WMLElement
img interfaceName=WMLImageElement img interfaceName=WMLImageElement
input input
#if 0
# Note: 'insertedLegend' is not an official WML element - internal purpose only! # Note: 'insertedLegend' is not an official WML element - internal purpose only!
#endif
insertedLegend interfaceName=WMLInsertedLegendElement insertedLegend interfaceName=WMLInsertedLegendElement
meta meta
noop noop
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment