[webkit-changes] cvs commit:
WebCore/layout-tests/dom/html/level2/html
HTMLIsIndexElement01-expected.txt HTMLIsIndexElement02-expected.txt
HTMLIsIndexElement03-expected.txt
Darin
darin at opensource.apple.com
Tue Aug 30 21:55:13 PDT 2005
darin 05/08/30 21:55:12
Modified: . ChangeLog
khtml/html htmlparser.cpp
layout-tests/dom/html/level2/html
HTMLIsIndexElement01-expected.txt
HTMLIsIndexElement02-expected.txt
HTMLIsIndexElement03-expected.txt
Log:
Reviewed by Maciej.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4574
HTML parser does not put attributes on the <isindex> element
* layout-tests/dom/html/level2/html/HTMLIsIndexElement01-expected.txt:
* layout-tests/dom/html/level2/html/HTMLIsIndexElement02-expected.txt:
* layout-tests/dom/html/level2/html/HTMLIsIndexElement03-expected.txt:
Updated to expect success.
* khtml/html/htmlparser.cpp: (HTMLParser::handleIsindex): Updated to
put the attributes on the <isindex> element.
Revision Changes Path
1.47 +15 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog 31 Aug 2005 04:38:33 -0000 1.46
+++ ChangeLog 31 Aug 2005 04:55:10 -0000 1.47
@@ -2,6 +2,21 @@
Reviewed by Maciej.
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4574
+ HTML parser does not put attributes on the <isindex> element
+
+ * layout-tests/dom/html/level2/html/HTMLIsIndexElement01-expected.txt:
+ * layout-tests/dom/html/level2/html/HTMLIsIndexElement02-expected.txt:
+ * layout-tests/dom/html/level2/html/HTMLIsIndexElement03-expected.txt:
+ Updated to expect success.
+
+ * khtml/html/htmlparser.cpp: (HTMLParser::handleIsindex): Updated to
+ put the attributes on the <isindex> element.
+
+2005-08-30 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4540
event handlers for all custom events called when any custom event is set
1.109 +20 -14 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- htmlparser.cpp 29 Aug 2005 21:29:18 -0000 1.108
+++ htmlparser.cpp 31 Aug 2005 04:55:11 -0000 1.109
@@ -1316,28 +1316,34 @@
{
NodeImpl *n;
HTMLFormElementImpl *myform = form;
- if ( !myform ) {
+ if (!myform) {
myform = new HTMLFormElementImpl(document);
n = myform;
} else
- n = new HTMLDivElementImpl( document );
- NodeImpl *child = new HTMLHRElementImpl( document );
- n->addChild( child );
- AttributeImpl* a = t->attrs ? t->attrs->getAttributeItem(promptAttr) : 0;
+ n = new HTMLDivElementImpl(document);
+
+ NamedMappedAttrMapImpl *attrs = t->attrs;
+ t->attrs = NULL;
+
+ HTMLIsIndexElementImpl *isIndex = new HTMLIsIndexElementImpl(document, myform);
+ isIndex->setAttributeMap(attrs);
+ isIndex->setAttribute(typeAttr, "khtml_isindex");
+
#if APPLE_CHANGES
DOMString text = searchableIndexIntroduction();
#else
DOMString text = i18n("This is a searchable index. Enter search keywords: ");
#endif
- if (a)
- text = DOMString(a->value()) + " ";
- child = new TextImpl(document, text);
- n->addChild( child );
- child = new HTMLIsIndexElementImpl(document, myform);
- static_cast<ElementImpl *>(child)->setAttribute(typeAttr, "khtml_isindex");
- n->addChild( child );
- child = new HTMLHRElementImpl( document );
- n->addChild( child );
+ if (attrs)
+ if (AttributeImpl *a = attrs->getAttributeItem(promptAttr))
+ text = a->value().domString() + " ";
+
+ attrs->deref();
+
+ n->addChild(new HTMLHRElementImpl(document));
+ n->addChild(new TextImpl(document, text));
+ n->addChild(isIndex);
+ n->addChild(new HTMLHRElementImpl(document));
return n;
}
1.2 +2 -3 WebCore/layout-tests/dom/html/level2/html/HTMLIsIndexElement01-expected.txt
Index: HTMLIsIndexElement01-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/dom/html/level2/html/HTMLIsIndexElement01-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLIsIndexElement01-expected.txt 26 Jul 2005 08:35:42 -0000 1.1
+++ HTMLIsIndexElement01-expected.txt 31 Aug 2005 04:55:11 -0000 1.2
@@ -1,3 +1,2 @@
-Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLIsIndexElement01
-Status: failure
-Detail: IsIndex.Prompt: assertEquals failed, actual , expected New Employee: .
+Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLIsIndexElement01
+Status: Success
1.2 +1 -1 WebCore/layout-tests/dom/html/level2/html/HTMLIsIndexElement02-expected.txt
Index: HTMLIsIndexElement02-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/dom/html/level2/html/HTMLIsIndexElement02-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLIsIndexElement02-expected.txt 26 Jul 2005 08:35:42 -0000 1.1
+++ HTMLIsIndexElement02-expected.txt 31 Aug 2005 04:55:12 -0000 1.2
@@ -1,3 +1,3 @@
Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLIsIndexElement02
Status: failure
-Detail: IsIndex.Prompt: assertEquals failed, actual , expected Old Employee: .
+Detail: formNullLink: assertNull failed, actual [object FORM]
1.2 +2 -3 WebCore/layout-tests/dom/html/level2/html/HTMLIsIndexElement03-expected.txt
Index: HTMLIsIndexElement03-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/dom/html/level2/html/HTMLIsIndexElement03-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLIsIndexElement03-expected.txt 26 Jul 2005 08:35:42 -0000 1.1
+++ HTMLIsIndexElement03-expected.txt 31 Aug 2005 04:55:12 -0000 1.2
@@ -1,3 +1,2 @@
-Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLIsIndexElement03
-Status: failure
-Detail: promptLink: assertEquals failed, actual , expected New Employee: .
+Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLIsIndexElement03
+Status: Success
More information about the webkit-changes
mailing list