WebCore:
Reviewed and landed by Darin.
* layout-tests/dom/html/level2/html/HTMLAppletElement01.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement02.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement03.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement04.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement05.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement06.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement07.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement08.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement09.html:
* layout-tests/dom/html/level2/html/HTMLAppletElement10.html:
Put CODE attribute inside of the APPLET element again.
* layout-tests/dom/html/level2/html/HTMLAppletElement04-expected.txt:
This passes now.
WebKitTools:
Reviewed and landed by Darin.
* DumpRenderTree/DumpRenderTree.m: (main): Disable Java while running tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@10323 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement01.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement01.html
index e35d551..db685c4 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement01.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement01.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement01.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement02.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement02.html
index 7de46f7..7d8e75c 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement02.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement02.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement02.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement03.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement03.html
index 5ad3e8e..75e8e59 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement03.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement03.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement03.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement04-expected.txt b/LayoutTests/dom/html/level2/html/HTMLAppletElement04-expected.txt
index f4c7083..859f672 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement04-expected.txt
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement04-expected.txt
@@ -1,3 +1,2 @@
-Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLAppletElement04
-Status: failure
-Detail: codeLink: assertEquals failed, actual , expected org/w3c/domts/DOMTSApplet.class.
+Test: http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLAppletElement04
+Status: Success
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement04.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement04.html
index b84db45..eb30f4f 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement04.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement04.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement04.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement05.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement05.html
index b4c51d8..8dbbf3d 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement05.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement05.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement05.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement06.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement06.html
index a5214dd..bceda4f 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement06.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement06.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement06.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement07.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement07.html
index 7db0f8b..bad0e3c 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement07.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement07.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement07.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement08.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement08.html
index f2b2a38..837b0c6 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement08.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement08.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement08.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement09.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement09.html
index 46a2ebc..96a580c 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement09.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement09.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement09.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/LayoutTests/dom/html/level2/html/HTMLAppletElement10.html b/LayoutTests/dom/html/level2/html/HTMLAppletElement10.html
index 81349e9..9930967 100644
--- a/LayoutTests/dom/html/level2/html/HTMLAppletElement10.html
+++ b/LayoutTests/dom/html/level2/html/HTMLAppletElement10.html
@@ -6,8 +6,7 @@
<script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLAppletElement10.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
<BODY onload="loadComplete()">
<P>
-<!-- CODE="org/w3c/domts/DOMTSApplet.class" -->
-<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
+<APPLET ALIGN="bottom" ALT="Applet Number 1" ARCHIVE="" CODE="org/w3c/domts/DOMTSApplet.class" CODEBASE="applets" HEIGHT="306" HSPACE="0" NAME="applet1" VSPACE="0" WIDTH="301"></APPLET>
</P>
</BODY>
</HTML>
diff --git a/WebCore/ChangeLog-2005-12-19 b/WebCore/ChangeLog-2005-12-19
index dafe184..7f4957c 100644
--- a/WebCore/ChangeLog-2005-12-19
+++ b/WebCore/ChangeLog-2005-12-19
@@ -1,3 +1,22 @@
+2005-08-25 Anders Carlsson <andersca@mac.com>
+
+ Reviewed and landed by Darin.
+
+ * layout-tests/dom/html/level2/html/HTMLAppletElement01.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement02.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement03.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement04.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement05.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement06.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement07.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement08.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement09.html:
+ * layout-tests/dom/html/level2/html/HTMLAppletElement10.html:
+ Put CODE attribute inside of the APPLET element again.
+
+ * layout-tests/dom/html/level2/html/HTMLAppletElement04-expected.txt:
+ This passes now.
+
2005-08-25 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
@@ -76,7 +95,7 @@
A ridiculously large patch including all of the following:
1. Sync-up with KDE SVN HEAD, including:
- a. Removal of C++ DOM
+ a. Removal of C+DOM
b. JS bindings code auto-generation
c. DocumentPtr in addition to DocumentImpl
d. DOMStringImpl instead of DOMString
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dda5127..5f3fb05 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-25 Anders Carlsson <andersca@mac.com>
+
+ Reviewed and landed by Darin.
+
+ * DumpRenderTree/DumpRenderTree.m: (main): Disable Java while running tests.
+
2005-08-24 Darin Adler <darin@apple.com>
Reviewed by Maciej.
@@ -43,6 +49,7 @@
Added display of "-w3c.png" baseline images for SVG.
http://bugzilla.opendarwin.org/show_bug.cgi?id=4581
+>>>>>>> 1.80
2005-08-20 Eric Seidel <eseidel@apple.com>
* Scripts/run-webkit-tests:
diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.m b/WebKitTools/DumpRenderTree/DumpRenderTree.m
index da86332..e6268ce 100644
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.m
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.m
@@ -94,6 +94,7 @@
[preferences setDefaultFontSize:16];
[preferences setDefaultFixedFontSize:13];
[preferences setMinimumFontSize:9];
+ [preferences setJavaEnabled:NO];
int option;
while ((option = getopt_long(argc, (char * const *)argv, "", options, NULL)) != -1)
