58 files changed, 903 insertions, 571 deletions
diff --git a/WebCore/manual-tests/accessibility/java-applet.html b/WebCore/manual-tests/accessibility/java-applet.html
new file mode 100644
index 0000000..5b5fd69
--- /dev/null
+++ b/WebCore/manual-tests/accessibility/java-applet.html
@@ -0,0 +1,20 @@
+<html>
+<body id="body">
+
+<applet code="AppletTest.class" width=200 height=140 codebase="resources" name="appletTest"></applet>
+
+<p>This test checks our support for accessibility of java applets.</p>
+<p>To test: (on mac only) 
+<ol>
+   <li>Open Accessibility Inspector. Move mouse onto white area of web area.
+   <li>Press Cmd+F7 to lock onto the web area.
+   <li>Click on the "Go To" drop down in the window that appears.
+   <li>Choose AXChildren and select the AXGroup "Button".
+   <li>Choose AXChildren again and do the same.
+   <li>Continue this until you see the AXButton.
+   <li>If you do not see an AXButton, the test fails.
+</ol>
+<hr>
+
+</body>
+</html>
diff --git a/WebCore/manual-tests/accessibility/resources/AppletTest.class b/WebCore/manual-tests/accessibility/resources/AppletTest.class
new file mode 100644
index 0000000..5e551a3
--- /dev/null
+++ b/WebCore/manual-tests/accessibility/resources/AppletTest.class
diff --git a/WebCore/manual-tests/accessibility/resources/AppletTest.java b/WebCore/manual-tests/accessibility/resources/AppletTest.java
new file mode 100644
index 0000000..2c98a32
--- /dev/null
+++ b/WebCore/manual-tests/accessibility/resources/AppletTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Source for a test applet used by layout tests. */
+
+import javax.swing.*;
+
+public class AppletTest extends JApplet { 
+    
+    public void init() { 
+
+        setLayout(null); 
+        JButton button = new JButton("button"); 
+        JTextField textField = new JTextField("TextField",20); 
+
+        button.setBounds(10,10,100,30); 
+        textField.setBounds(10,40,100,40); 
+        
+        add(button); 
+        add(textField); 
+    }    
+}
diff --git a/WebCore/manual-tests/animated-gif-bfcache-crash.html b/WebCore/manual-tests/animated-gif-bfcache-crash.html
new file mode 100644
index 0000000..581a957
--- /dev/null
+++ b/WebCore/manual-tests/animated-gif-bfcache-crash.html
@@ -0,0 +1,50 @@
+<html>
+<script>
+
+var theWindow;
+
+function step1()
+{
+    theWindow = window.open("./resources/containsAnimatedGif.html", "x");
+    setTimeout(step2, 100);
+}
+
+function step2()
+{
+    window.open("about:blank", "x");
+    setTimeout(step3, 100);
+}
+
+function step3()
+{
+    theWindow.close();
+    theWindow = window.open("./resources/containsAnimatedGif.html");
+    setTimeout(step4, 500);
+}
+
+function step4()
+{
+    theWindow.close();
+    document.getElementById("results").appendChild(document.createTextNode("PASSED"));
+}
+
+</script>
+
+<body>
+<p>This page tests the fix for <br>
+<a href="rdar://problem/6978362">rdar://problem/6978362</a> Repro crash animating GIF if previously used in a closed window's back/forward list <br>
+<a href="https://bugs.webkit.org/show_bug.cgi?id=26568">Bug 26568</a> <br>
+<p>Prerequisites:<br>
+<ul><li>run the LayoutTest's webserver (WebKitTools/run-webkit-httpd)</ul>
+<p>Then click this button: <input type="button" value="Run test" onclick="step1()">
+<p>Expected results:<br>
+<ul>
+<li>A window will open, loading a page with an animated gif.</li>
+<li>about:blank will be loaded in that window, putting the animated gif in the back/forward cache.</li>
+<li>That window will close.</li>
+<li>A new window will open, loading that page with the animated gif</li>
+<li>No crash means test passed </li>
+</ul>
+<span style="color:green;" id="results"></span>
+</body>
+</html>
diff --git a/WebCore/manual-tests/css3-cursor-fallback-quirks.html b/WebCore/manual-tests/css3-cursor-fallback-quirks.html
index 5cb7754..0efca75 100644
--- a/WebCore/manual-tests/css3-cursor-fallback-quirks.html
+++ b/WebCore/manual-tests/css3-cursor-fallback-quirks.html
@@ -24,14 +24,20 @@
 <td><div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff) 1 1 text;'></div></td> <!-- CSS3 hot spot - invalid, should have comma after hotspot coords -->
 </tr>
 </table>
-<p>In each of the blue boxes below, the cursor should show the text cursor, since all hotspot definitions are ignored in quirks mode.</p>
+<p>In each of the blue boxes below, the cursor should show the text cursor, since they contain invalid hotspots.</p>
 <table><tr>
 <td><div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff) 1, text;'></div></td> <!-- CSS3 hot spot - ignored in IE -->
-<td><div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff) 1 2, text;'></div></td> <!-- CSS3 hot spot - ignored in IE -->
  <td><div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff) 1 2 3, text;'></div></td> <!-- CSS3 hot spot - ignored in IE -->
 </tr>
 </table>
 
+<p>In each of the blue boxes below, the cursor should show the help, since they contain valid hotspots.</p>
+<table><tr>
+<td><div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff) 1 2;'></div></td> <!-- CSS3 hot spot - ignored in IE -->
+<td><div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff) 1 2, text;'></div></td> <!-- CSS3 hot spot - ignored in IE -->
+</tr>
+</table>
+
 <p></p>
 <p><span style='background-color:gray; cursor:url(nonexistent.png), url("resources/helpCursor.tiff");'>Should show an I-beam cursor.</span></p> <!-- An invalid declaration, even by WinIE standards -->
 <p>The following testcases test inheritance of the cursor property. The first one should have the help cursor for both divs (normal inheritance). The second one should have help cursor for big div, text cursor for small div (inner div has cursor property, should not inherit). The next has invalid css syntax in the inner div, so it should inherit from the parent. The last two testcases have correct syntax and there is no inheritance in this case.</p>
@@ -43,7 +49,7 @@
 </td><td>
 <div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff), text;'><div style="width:50px;height:50px;background-color:gray;cursor:foobar"></div></div>
 </td><td>
-<div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff), text;'><div style="width:50px;height:50px;background-color:gray;cursor:url(resources/helpCursor.tiff) 1 2 3, text"></div></div>
+<div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff), text;'><div style="width:50px;height:50px;background-color:gray;cursor:url(resources/helpCursor.tiff) 1 2, text"></div></div>
 </td><td>
 <div style='width:100px;height:100px;background-color:lightblue; cursor:url(resources/helpCursor.tiff), text;'><div style="width:50px;height:50px;background-color:gray;cursor:url(nonexistant.png), text"></div></div>
 </td></tr>
diff --git a/WebCore/manual-tests/drag-caret.html b/WebCore/manual-tests/drag-caret.html
new file mode 100644
index 0000000..4334ab2
--- /dev/null
+++ b/WebCore/manual-tests/drag-caret.html
@@ -0,0 +1,3 @@
+<p>This tests dragging over an input element, to make sure no drag-cursor is left behind.</p>
+<p><input></p>
+<p>Drag some text over the input element and make sure the Drag Caret disappears when the drag exits the input element. Per https://bugs.webkit.org/show_bug.cgi?id=26787</p>
diff --git a/WebCore/manual-tests/drag-enter-alert.html b/WebCore/manual-tests/drag-enter-alert.html
new file mode 100644
index 0000000..e563923
--- /dev/null
+++ b/WebCore/manual-tests/drag-enter-alert.html
@@ -0,0 +1,29 @@
+<html> 
+<head> 
+<script type="text/javascript"> 
+function test() {
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    var element = document.documentElement;
+    var showAlert = function() {
+        alert('Click OK button.');
+    };
+ 
+    if (element.addEventListener)
+        element.addEventListener('dragenter', showAlert, false);
+    else
+        element.attachEvent('ondragenter', showAlert);
+}
+</script> 
+ 
+</head>
+<body onload="test()">
+    <p>Do the following and see if Webkit crashes.</p>
+    <ul>
+      <li>Drag the image</li> 
+      <li>Click the OK button on the alert box</li> 
+    </ul>
+    <img id="dragimage" src="resources/drag-image.png" width="32px" height="32px"> 
+</body>
+</html> 
diff --git a/WebCore/manual-tests/drag-escape.html b/WebCore/manual-tests/drag-escape.html
new file mode 100644
index 0000000..ebdf4e7
--- /dev/null
+++ b/WebCore/manual-tests/drag-escape.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+var expectedEvents = ["dragstart", "dragend"];
+var i = 0;
+
+function recordEvent(e) {
+    log(e.type);
+    if (e.type !== expectedEvents[i]) {
+        log("FAIL - expected " + expectedEvents[i] + " but got " + e.type);
+    } else if (i == expectedEvents.length - 1) {
+        log("SUCCESS");
+    } else {
+        i++;
+    }
+}
+
+
+function log(msg) {
+    var tn = document.createTextNode(msg + "\n");
+    document.getElementById("log").appendChild(tn);
+}
+
+function dragStart(e) {
+    recordEvent(e);
+}
+
+document.ondragend = function(e) {
+    recordEvent(e);
+};
+
+document.ondrop = function(e) {
+    log("FAIL - we should not get a " + e.type);
+};
+
+document.ondragenter = document.ondragover = function(e) {
+    e.preventDefault();
+};
+
+
+</script>
+</head>
+<body>
+    <p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=26699">https://bugs.webkit.org/show_bug.cgi?id=26699</a></p>
+
+    <p>Instructions: </p>
+
+    <p>Drag the "Drag Me!" link below</p>
+    <p>Press escape</p>
+
+    <a id="test-link" href="http://webkit.org" ondragstart="dragStart(event)">Drag Me!</a>
+
+    <pre id="log"></pre>
+</body>
+</html>
diff --git a/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html b/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html
new file mode 100644
index 0000000..1d5a791
--- /dev/null
+++ b/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html
@@ -0,0 +1,55 @@
+<html>
+    <head>
+        <title>Test for WebKit bug 24735: Poor setDragImage support on Windows</title>
+        <style type="text/css">
+
+            .draggable {
+                -webkit-user-drag: element;
+                -webkit-user-select: none;
+            }
+            
+            #linkToUseAsImage {
+                background-color: silver;
+            }
+            
+            #divToUseAsImage {
+                background-color: pink;
+            }
+
+        </style>
+
+        <script type="text/javascript">
+            function dragDivAndSeeImageDragged()
+            {
+                event.dataTransfer.setDragImage(document.getElementById("imgToUseAsImage"), event.pageX, event.pageY);
+            }
+            
+            function dragImageAndSeeDivDragged()
+            {
+                event.dataTransfer.setDragImage(document.getElementById("divToUseAsImage"), event.pageX, event.pageY);
+            }
+        </script>
+    </head>
+    <body >
+        <h3>Test for <a href='https://bugs.webkit.org/show_bug.cgi?id=24735'>WebKit bug 24735</a>: Poor setDragImage support on Windows</h3>
+
+        <p>Instructions: </p>
+        <p>When you drag the first div, the image under the cursor should be of the second image. </p>
+        <p>When you drag the first image, the image under the cursor should be of the second div. </p>
+        
+        <br />
+        <br />
+        
+        <div class="draggable" ondragstart="dragDivAndSeeImageDragged()"> Drag me, I am a div! (first div)</div>
+        <br />
+        <br />
+        <img src="resources/webkit-background.png" class="draggable" ondragstart="dragImageAndSeeDivDragged()" />
+        <br />
+        <br />
+        <img src="resources/drag-image.png" id="imgToUseAsImage" />
+        <br />
+        <br />
+        <div id="divToUseAsImage"> When a drag is started on the image, this is the div that is used as the drag image! (second div)</div>
+    
+    </body>
+</html>
diff --git a/WebCore/manual-tests/focusringcolor-change-on-theme-change.html b/WebCore/manual-tests/focusringcolor-change-on-theme-change.html
new file mode 100644
index 0000000..ca12fe6
--- /dev/null
+++ b/WebCore/manual-tests/focusringcolor-change-on-theme-change.html
@@ -0,0 +1,8 @@
+<input value="Click on me!  Focus ring color around this input element should change." style="width:100%">
+<ul>
+<li>Select the input element above.</li>
+<li>Change the system focus ring color.<br>On OS X you can do this by going to System Preferences-&gt;Appearance and selecting another value in the Appearance popup menu.</li>  
+<li>Make Safari the active application again.</li>
+</ul>
+
+<p>The tests passes if the focus ring around the input element changes color.</p>
diff --git a/WebCore/manual-tests/gtk/paste-richtext-from-firefox.html b/WebCore/manual-tests/gtk/paste-richtext-from-firefox.html
new file mode 100644
index 0000000..c739a59
--- /dev/null
+++ b/WebCore/manual-tests/gtk/paste-richtext-from-firefox.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>Paste rich text from firefox</title>
+    </head>
+    <body>
+        <p><b>BUG ID:</b>
+        <a href="https://bugs.webkit.org/show_bug.cgi?id=26791">Bugzilla bug 26791</a>
+        [Gtk] Paste of rich text from firefox results garbled markup
+        </p>
+        <h1>Paste rich text from firefox</h1>
+        <p>
+        <b>STEPS TO TEST:</b><br>
+        <ol>
+            <li>Launch FireFox to browse <a href="http://www.apple.com">http://www.apple.com</a></li>
+            <li>Select that text or picture from FireFox page</li>
+            <li>Copy them use <b>Ctrl-C</b> / Option-C, (or just select them on Linux)</li>
+            <li>Back in WebkitGtk, click inside the EditableArea below, </li>
+            <li>Paste them use <b>Ctrl-V</b> / Option-V, (or just Middle Mouse Click on Linux)</li>
+        </ol>
+        <p><b>Ensure</b> that text or picture has been pasted with formats and no garbled.</p>
+        <div title="EditableArea" contentEditable="true" 
+            style="display: block; border: 1px solid green; margin: 5px; padding: 15px;">
+            <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
+        </div>
+        </p>
+    </body>
+</html>
+
diff --git a/WebCore/manual-tests/inspector/named-evals.html b/WebCore/manual-tests/inspector/named-evals.html
new file mode 100644
index 0000000..0c52531
--- /dev/null
+++ b/WebCore/manual-tests/inspector/named-evals.html
@@ -0,0 +1,72 @@
+<html>
+<head>
+<script>
+
+function log(message) {
+    console.log(message)
+}
+
+var funcBody = "(){\n" + 
+"   var thisFunc = arguments.callee;\n" +
+"   if (!thisFunc.name) thisFunc.displayName = 'f%';\n" + 
+"   log(thisFunc.name || thisFunc.displayName);\n" +
+"}";
+
+var funcs = [];
+var patterns = [
+    // proper use of @sourceURL comment
+    "//@sourceURL=f%.js\nfuncs.push(function" + funcBody + ")",
+    "//@sourceURL=f%.js\nfuncs.push(function f%" + funcBody + ")",
+    " //@sourceURL=f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "// @sourceURL=f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "//@ sourceURL=f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "//@sourceURL =f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "//@sourceURL= f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "//@sourceURL=f%.js \nfuncs.push(function f%" + funcBody + ")",
+    " // @ sourceURL = f%.js \nfuncs.push(function f%" + funcBody + ")",
+    "//@sourceURL=f%.js\nfuncs.push(function f%" + funcBody + ");\n//@sourceURL=should-not-see\n",
+    "funcs.push(function f%" + funcBody + ")\n//@sourceURL=f%.js\n",
+    "funcs.push(function f%" + funcBody + ")\n//@sourceURL=f%.js \n",
+    "funcs.push(function f%" + funcBody + ")\n//@sourceURL=f%.js",
+    
+    // improper or non-existant use of @sourceURL comment
+    "funcs.push(function f%" + funcBody + ")",
+    "//@sourceurl=f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "//sourceURL=f%.js\nfuncs.push(function f%" + funcBody + ")",
+    "/*@sourceURL=f%.js*/\nfuncs.push(function f%" + funcBody + ")",
+    "//\nsourceURL='f%.js';\nfuncs.push(function f%" + funcBody + ")",
+    "//@sourceURL=\nfuncs.push(function" + funcBody + ")",
+];
+
+
+for (var i=0; i<patterns.length; i++) {
+    eval(patterns[i].replace(/%/g, i));
+}
+
+</script>
+</head>
+
+<body>
+<p>This page's JavaScript calls functions from named eval()'s.
+    
+<p>Used to test <a href="https://bugs.webkit.org/show_bug.cgi?id=25475">https://bugs.webkit.org/show_bug.cgi?id=25475</a>
+
+<p>Load the Web Inspector and look at
+the script's panel, and the script list drop-down control.  
+You should see entries for scripts named 
+<tt>"(program):f0.js"</tt> through <tt>"(program):f12.js"</tt>.  The entries were named
+via proper use of the <tt>//@sourceURL</tt> comment.  There will also be entries
+named <tt>"(program)"</tt> for source that does not properly use, or use at all,
+the <tt>//@sourceURL</tt> comment.
+
+<p>Now, set a breakpoint in the body of the <tt>"f0"</tt> function in the
+<tt>"(program):f0.js"</tt> script.  Then click this button:
+
+<p><input type="button" value="run" onclick="funcs[0]()">
+
+<p>When stopped at the breakpoint, the entry for the function in the
+call stack control should the name of the script, <tt>"(program):f0.js"</tt>,
+beside the function name <tt>"f0"</tt>.  Note the function name for 
+<tt>f0</tt> is set with the new <tt>"displayName"</tt> property.
+</body>
+</html>
diff --git a/WebCore/manual-tests/keyboard_select_non_english.html b/WebCore/manual-tests/keyboard_select_non_english.html
new file mode 100644
index 0000000..d06ef97
--- /dev/null
+++ b/WebCore/manual-tests/keyboard_select_non_english.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
+<title>
+Test select non English element
+</title>
+</head>
+<body>
+See bug:<a href="https://bugs.webkit.org/show_bug.cgi?id=25899">25899</a>.
+<p>
+Choose the correct input method. Open the select element then type the first 
+letter of one of the elements. The search prefix should be the first non English
+letter, not the value of the physical keyboard plus the native non English
+letter. For example, set the input method as Hebrew, hit keyboard 'c', the
+translated Hebrew character is 'ב'. The search prefix should be 'ב', not "cב".
+And the right element should be selected.
+<p>
+
+Hebrew Select:
+<select style="direction:rtl">
+  <option>אאא</option>
+  <option>בבב</option>
+  <option>גגג</option>
+  <option>דדדד מילה ערוכה מאוד, כדי שיהיה אפשר לראות יישור</option>
+</select>
+
+Russian Select: 
+<select>
+  <option>фисв</option>
+  <option>уап</option>
+  <option>ршол</option>
+  <option>дьт</option>
+</select>
+</body>
+</html>
diff --git a/WebCore/manual-tests/non-bmp.html b/WebCore/manual-tests/non-bmp.html
new file mode 100644
index 0000000..e7cc581
--- /dev/null
+++ b/WebCore/manual-tests/non-bmp.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>Bug 25657 : Non-BMP characters</title>
+</head>
+<body>
+Test for <a href="http://bugs.webkit.org/show_bug.cgi?id=25657">bug 25657</a> : 
+Listed below are Mathematical Bold Capital A through E (U+1D400 .. U+1D404). Note that you need to install a font covering Plane 1 like Code2001 for this test.
+<div>
+&#x1d400;&#x1d401;&#x1d402;&#x1d403;&#x1d404;
+</div>
+</body>
+</html>
diff --git a/WebCore/manual-tests/optgroup-empty-and-nested.html b/WebCore/manual-tests/optgroup-empty-and-nested.html
index 062996b..6aa3e7b 100644
--- a/WebCore/manual-tests/optgroup-empty-and-nested.html
+++ b/WebCore/manual-tests/optgroup-empty-and-nested.html
@@ -21,7 +21,11 @@
     <!-- for an optgroup without a label, IE will show an empty, unselectable row.
          Firefox doesn't show it. We /do/ show it because someone might be using
          it as a spacer. -->
-    <optgroup>
+    <!-- Additionally, this has been updated to test the crash fixed in
+         https://bugs.webkit.org/show_bug.cgi?id=26656. When setting the
+         font-size in the <optgroup> to extra large, opening the select element
+         must not leave any unpainted areas of overlapping text. -->
+    <optgroup style="font-size: x-large;">
       <option value="2">Item inside an optgroup without a label</option>
     </optgroup>
 
@@ -70,5 +74,7 @@
   <li>Item four</li>
 </ul>
 
+<p>The text of the rows of the dropdown must not overlap each other.</p>
+
 </body>
 </html>
diff --git a/WebCore/manual-tests/qt/unload-alert.html b/WebCore/manual-tests/qt/unload-alert.html
new file mode 100644
index 0000000..3b02818
--- /dev/null
+++ b/WebCore/manual-tests/qt/unload-alert.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+</head>
+<body  onunload="alert('goodbye');">
+Reload me twice ensuring that this didn't result in a crash. Test added due to
+bug <a href="https://bugs.webkit.org/show_bug.cgi?id=26556">@25556</a>
+</body>
+</html>
diff --git a/WebCore/manual-tests/resources/containsAnimatedGif.html b/WebCore/manual-tests/resources/containsAnimatedGif.html
new file mode 100644
index 0000000..77b2cbf
--- /dev/null
+++ b/WebCore/manual-tests/resources/containsAnimatedGif.html
@@ -0,0 +1,3 @@
+<html>
+<img src="http://127.0.0.1:8000/misc/resources/animated-gif-with-offsets.gif" />
+</html>
diff --git a/WebCore/manual-tests/resources/drag-image.png b/WebCore/manual-tests/resources/drag-image.png
new file mode 100644
index 0000000..a229616
--- /dev/null
+++ b/WebCore/manual-tests/resources/drag-image.png
diff --git a/WebCore/manual-tests/select-popup-on-spacebar.html b/WebCore/manual-tests/select-popup-on-spacebar.html
new file mode 100644
index 0000000..dfcee40
--- /dev/null
+++ b/WebCore/manual-tests/select-popup-on-spacebar.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+</head>
+<body onload="document.getElementById('selectId').focus()">
+<p><b>BUG ID:<a href="https://bugs.webkit.org/show_bug.cgi?id=18363">18363</a>.</p>
+<p id="description">
+This test ensures that pressing spacebar on Mac and Gtk ports or pressing
+return in Gtk port will popup the select control when focused.
+</p>
+
+<p id="test" style="background-color:skyblue; padding:3px;"><b>STEPS TO TEST:</b> <br>
+Press <em>spacebar</em> or the <em>return</em> key (Gtk only).
+
+<p id="success" style="background-color:palegreen; padding:3px;"><b>TEST PASS:</b> 
+Select pops up the menu list</p>
+
+<p id="failure" style="background-color:#FF3300; padding:3px;"><b>TEST FAIL:</b>  
+Select does not popup a menu list - nothing happens.</p>
+
+
+<select id="selectId">
+  <option>Select</option>
+  <option>Item 1</option>
+</select>
+
+</body>
+</html>
diff --git a/WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html b/WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html
new file mode 100644
index 0000000..ab650ac
--- /dev/null
+++ b/WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html
@@ -0,0 +1,14 @@
+<html> 
+<body>
+<p>Tests bug <a href="https://bugs.webkit.org/show_bug.cgi?id=26200">26200</a> where the caret position jumps off to an incorrect position after auto-correcting a misspelled word.</p>
+<p>Open this file in Google Chromium (version 3.0 +), in Windows, and enable the --auto-spell-correct flag. Insert the word 'teh' between any two words in the paragraph below.</p>
+<p>SUCCESS:  After hitting space, 'teh' is auto-corrected to 'the', and the caret stays on in the place it is supposed to be in after typing the word and hitting space.</p>
+<textarea rows="6" cols="35">
+This is an english statement.
+This is an english statement.
+This is an english statement.
+This is an english statement.
+This is an english statement.
+</textarea>
+</body>
+<html>
diff --git a/WebCore/manual-tests/wml/StartTests.wml b/WebCore/manual-tests/wml/StartTests.wml
new file mode 100644
index 0000000..fa9f721
--- /dev/null
+++ b/WebCore/manual-tests/wml/StartTests.wml
@@ -0,0 +1,35 @@
+<wml>
+<card>
+<a href="a-br-element.wml">a-br-element.wml</a><br/>
+<a href="a-element.wml">a-element.wml</a><br/>
+<a href="a-img-element.wml">a-img-element.wml</a><br/>
+<a href="access-target.wml">access-target.wml</a><br/>
+<a href="anchor-br-element.wml">anchor-br-element.wml</a><br/>
+<a href="anchor-element.wml">anchor-element.wml</a><br/>
+<a href="anchor-img-element.wml">anchor-img-element.wml</a><br/>
+<a href="card-newcontext-attr.wml">card-newcontext-attr.wml</a><br/>
+<a href="card-onenterbackward.wml">card-onenterbackward.wml</a><br/>
+<a href="card-onenterforward.wml">card-onenterforward.wml</a><br/>
+<a href="card-ontimer.wml">card-ontimer.wml</a><br/>
+<a href="deck-access-control.wml">deck-access-control.wml</a><br/>
+<a href="go-element.wml">go-element.wml</a><br/>
+<a href="input-format.wml">input-format.wml</a><br/>
+<a href="onevent-go.wml">onevent-go.wml</a><br/>
+<a href="onevent-noop.wml">onevent-noop.wml</a><br/>
+<a href="onevent-prev.wml">onevent-prev.wml</a><br/>
+<a href="onevent-refresh.wml">onevent-refresh.wml</a><br/>
+<a href="onevent-shadow.wml">onevent-shadow.wml</a><br/>
+<a href="select-element.wml">select-element.wml</a><br/>
+<a href="select-onpick-event.wml">select-onpick-event.wml</a><br/>
+<a href="setvar-element.wml">setvar-element.wml</a><br/>
+<a href="targetdeck.wml">targetdeck.wml</a><br/>
+<a href="task-go-in-anchor.wml">task-go-in-anchor.wml</a><br/>
+<a href="task-noop-in-do.wml">task-noop-in-do.wml</a><br/>
+<a href="task-prev-in-anchor.wml">task-prev-in-anchor.wml</a><br/>
+<a href="task-refresh-in-anchor.wml">task-refresh-in-anchor.wml</a><br/>
+<a href="template-go.wml">template-go.wml</a><br/>
+<a href="template-ontimer.wml">template-ontimer.wml</a><br/>
+<a href="timer.wml">timer.wml</a><br/>
+<a href="variable-substitution.wml">variable-substitution.wml</a><br/>
+</card>
+</wml>
diff --git a/WebCore/manual-tests/wml/a-br-element.wml b/WebCore/manual-tests/wml/a-br-element.wml
index c62543c..eb89765 100644
--- a/WebCore/manual-tests/wml/a-br-element.wml
+++ b/WebCore/manual-tests/wml/a-br-element.wml
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
- <card title="A element Test">
-  <p>Test for A element including BR element</p>
-  <p>
-   "Next Page" will be broken by BR element between them<br/>
-   <a href="../test.wml">Next <br/> page</a>
-  </p>
- </card>
+    <card title="A element Test">
+        <p>Test for A element including BR element</p>
+        <p>
+            "Next Page" will be broken by BR element between them<br/>
+            <a href="StartTests.wml">Next <br/> page</a>
+        </p>
+    </card>
 </wml> 
-
diff --git a/WebCore/manual-tests/wml/a-element.wml b/WebCore/manual-tests/wml/a-element.wml
index 07a00de..71c203b 100644
--- a/WebCore/manual-tests/wml/a-element.wml
+++ b/WebCore/manual-tests/wml/a-element.wml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
- <card title="A element Test">
-  <p>Test for A element. <br/>When mouse moves into link, "go to test.wml" will appear, click the link, will jump to test.wml</p>
-  
-  <p>
-   <a href="../test.wml" title="go to test.wml" >Next page</a>
-  </p>
- </card>
+    <card title="A element Test">
+        <p>Test for A element. <br/>When mouse moves into link, "go to StartTests.wml" will appear, click the link, will jump to StartTests.wml</p>
+        <p>
+            <a href="StartTests.wml" title="go to StartTests.wml" >Next page</a>
+        </p>
+    </card>
 </wml> 
-
diff --git a/WebCore/manual-tests/wml/a-img-element.wml b/WebCore/manual-tests/wml/a-img-element.wml
index 71dad86..ce538c8 100644
--- a/WebCore/manual-tests/wml/a-img-element.wml
+++ b/WebCore/manual-tests/wml/a-img-element.wml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
- <card title="A element Test">
-  <p>Test for A element including img element. </p>
-  <p>
-   <a href="../test.wml" title="Next Page"><img src="../resources/smile.gif"/></a>
-  </p>
- </card>
-</wml> 
-
+    <card title="A element Test">
+        <p>Test for A element including img element. </p>
+        <p>
+            <a href="StartTests.wml" title="Next Page"><img src="resources/smiley.png"/></a>
+        </p>
+    </card>
+</wml>
diff --git a/WebCore/manual-tests/wml/access-target.wml b/WebCore/manual-tests/wml/access-target.wml
index 7f00420..ec6e51a 100644
--- a/WebCore/manual-tests/wml/access-target.wml
+++ b/WebCore/manual-tests/wml/access-target.wml
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card ontimer="./targetdeck.wml">
-<timer name="t1" value="30"/>
-<p> Test for Deck Access control in WML. </p>
-<p> If the test passes, this deck will jump to "targetdeck.wml" after 3 second</p>
-</card>
+    <card ontimer="./targetdeck.wml">
+        <timer name="t1" value="30"/>
+        <p>Test for Deck Access control in WML.</p>
+        <p>If the test passes, this deck will jump to "targetdeck.wml" after 3 second</p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/anchor-br-element.wml b/WebCore/manual-tests/wml/anchor-br-element.wml
index 922325c..1a1750d 100644
--- a/WebCore/manual-tests/wml/anchor-br-element.wml
+++ b/WebCore/manual-tests/wml/anchor-br-element.wml
@@ -1,12 +1,10 @@
 <?xml version="1.0" ?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card title="Anchor Tag">
-<p> Test for br element enclosed with anchor element </p>
-<p>
-<anchor><go href="../test.wml"/>Go to <br/>test.wml</anchor>
-</p>
-</card>
+    <card title="Anchor Tag">
+        <p>Test for br element enclosed with anchor element</p>
+        <p>
+            <anchor><go href="StartTests.wml"/>Go to <br/>StartTests.wml</anchor>
+        </p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/anchor-element.wml b/WebCore/manual-tests/wml/anchor-element.wml
index fe59eac..4bc4798 100644
--- a/WebCore/manual-tests/wml/anchor-element.wml
+++ b/WebCore/manual-tests/wml/anchor-element.wml
@@ -1,36 +1,33 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
- <card title="Anchor Tag">
-  <p>
-  This is an anchor bound to go task<br/>
-   <anchor>Next page
-  <go href="cards.wml"/>
-   </anchor>
-  </p>
+    <card title="Anchor Tag">
+        <p>This is an anchor bound to go task<br/>
+            <anchor>
+                Next page
+                <go href="anchor-img-element.wml"/>
+            </anchor>
+        </p>
 
-   <p>
-   This an anchor bound to prev task<br/>
-   <anchor title="Previous" >Prev page
-   <prev/>
-   </anchor>
-  </p>
+        <p>This an anchor bound to prev task<br/>
+            <anchor title="Previous" >Prev page
+                <prev/>
+            </anchor>
+        </p>
 
-   <p>
-    This an anchor bound to refresh task<br/>
-    <anchor title="Refresh">Refresh $var
-    <refresh> 
-    <setvar name="var" value="me"/>
-    </refresh>
-    </anchor>
-  </p>
+        <p>This an anchor bound to refresh task<br/>
+            <anchor title="Refresh">Refresh $var
+                <refresh> 
+                    <setvar name="var" value="me"/>
+                </refresh>
+            </anchor>
+        </p>
 
-   <p>
-   This is an anchor contains img element, bound to prev task <br/>
-   <anchor title="click to go back">
-   <prev/>
-   <img src="../resources/smile.gif" />
-   </anchor>
-   </p>
- </card>
-</wml> 
+        <p>This is an anchor contains img element, bound to prev task<br/>
+            <anchor title="click to go back">
+                <prev/>
+                <img src="resources/smiley.png"/>
+            </anchor>
+        </p>
+    </card>
+</wml>
diff --git a/WebCore/manual-tests/wml/anchor-img-element.wml b/WebCore/manual-tests/wml/anchor-img-element.wml
index ddd0c28..b8b8559 100644
--- a/WebCore/manual-tests/wml/anchor-img-element.wml
+++ b/WebCore/manual-tests/wml/anchor-img-element.wml
@@ -1,12 +1,10 @@
 <?xml version="1.0" ?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card title="Anchor Tag">
-<p> Test for WML img enclosed with anchor element, when the mouse move into the image, the tip "go to test.wml" will appear</p>
-<p>
-<anchor title="go to test.wml"><img src="../resources/smile.gif"/> <go href="../test.wml"/></anchor>
-</p>
-</card>
+    <card title="Anchor Tag">
+        <p>Test for WML img enclosed with anchor element, when the mouse move into the image, the tip "go to StartTests.wml" will appear</p>
+        <p>
+            <anchor title="go to StartTests.wml"><img src="resources/smiley.png"/> <go href="StartTests.wml"/></anchor>
+        </p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/card-newcontext-attr.wml b/WebCore/manual-tests/wml/card-newcontext-attr.wml
index bcfa1d3..a02e197 100644
--- a/WebCore/manual-tests/wml/card-newcontext-attr.wml
+++ b/WebCore/manual-tests/wml/card-newcontext-attr.wml
@@ -1,20 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-
 <wml>
- <card id="firstcard" title="One">
- <p> Test for newcontext attribute of card element</p>
- <p> This is the first card, Click "Go" to enter card two. <br/> Because newcontext of card two is true, the history state will be clean, and the variable "$var1" won't be replaced</p>
- <do type="accept" label="Go">
- <go href="#secondcard">
-    <setvar name="var1" value="two"/> 
- </go>
- </do>
- </card>
+    <card id="firstcard" title="One">
+        <p>Test for newcontext attribute of card element</p>
+        <p>This is the first card, Click "Go" to enter card two.<br/>Because newcontext of card two is true, the history state will be clean, and the variable "$var1" won't be replaced</p>
+        <do type="accept" label="Go">
+            <go href="#secondcard">
+                <setvar name="var1" value="two"/> 
+            </go>
+        </do>
+    </card>
 
- <card id="secondcard" title="$var1" newcontext="true">
- <p> This is the card $var1 </p>
- <p> Because newcontext of this card is true, the history state will be clean, and the variable "$var1" won't be replaced</p>
- </card>
+    <card id="secondcard" title="$var1" newcontext="true">
+        <p>This is the card $var1</p>
+        <p>Because newcontext of this card is true, the history state will be clean, and the variable "$var1" won't be replaced</p>
+    </card>
 </wml>
-
diff --git a/WebCore/manual-tests/wml/card-onenterbackward.wml b/WebCore/manual-tests/wml/card-onenterbackward.wml
index 42ba104..acb5bf6 100644
--- a/WebCore/manual-tests/wml/card-onenterbackward.wml
+++ b/WebCore/manual-tests/wml/card-onenterbackward.wml
@@ -1,22 +1,23 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card id="card1" title="Card 1" onenterbackward="#card3"> 
-<p>Test for card onenterbackward intrinsic event</p>
-<p> Click "Go" to jump to the card2, if you go back from card2, it will jump to card3</p>
-<anchor title="go to card2">
-<go href="#card2">Go</go>
-</anchor>
-</card>
-<card id="card2" title="Card 2"> 
-<p>This is card2,click "Back" will back to the previous page</p> 
-<anchor>
-Back
-<prev />
-</anchor>
-</card>
-<card id="card3" title="Card 3" >
-<p>This is card3</p>
-</card>
+    <card id="card1" title="Card 1" onenterbackward="#card3"> 
+        <p>Test for card onenterbackward intrinsic event</p>
+        <p>Click "Go" to jump to the card2, if you go back from card2, it will jump to card3</p>
+        <anchor title="go to card2">
+            <go href="#card2">Go</go>
+        </anchor>
+    </card>
+
+    <card id="card2" title="Card 2"> 
+        <p>This is card2,click "Back" will back to the previous page</p> 
+        <anchor>
+            Back
+            <prev/>
+        </anchor>
+    </card>
+
+    <card id="card3" title="Card 3">
+        <p>This is card3</p>
+    </card>
 </wml> 
diff --git a/WebCore/manual-tests/wml/card-onenterforward.wml b/WebCore/manual-tests/wml/card-onenterforward.wml
index 5a7db37..ad22580 100644
--- a/WebCore/manual-tests/wml/card-onenterforward.wml
+++ b/WebCore/manual-tests/wml/card-onenterforward.wml
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card id="card1" title="Card 1" onenterforward="#card2">
-<p>Test for card onenterforward event</p>
-<p>Card one will jump to card two when entered forward it</p>
-</card>
-<card id="card2" title="Card 2">
-<p>Test for card onenterforward event</p>
-<p>This is card2, I am entered by card one forwarding</p>
-</card>
-</wml> 
+    <card id="card1" title="Card 1" onenterforward="#card2">
+        <p>Test for card onenterforward event</p>
+        <p>Card one will jump to card two when entered forward it</p>
+    </card>
 
+    <card id="card2" title="Card 2">
+        <p>Test for card onenterforward event</p>
+        <p>This is card2, I am entered by card one forwarding</p>
+    </card>
+</wml>
diff --git a/WebCore/manual-tests/wml/card-ontimer.wml b/WebCore/manual-tests/wml/card-ontimer.wml
index a1cc988..1d2c993 100644
--- a/WebCore/manual-tests/wml/card-ontimer.wml
+++ b/WebCore/manual-tests/wml/card-ontimer.wml
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-
 <wml>
-<head>
-<meta http-equiv="Cache-Control" content="max-age=0"/>
-</head>
-<card id="card1" ontimer="#card2" title="Card one">
-<p> Test for card ontimer intrinsic event in WML </p>
-<timer name="time1" value="50"/>
-<p>
-This is card one<br/>The timer is triggered by the ontimer intrinsic event(ontimer as attribute of card element)<br/>When the timer is timeout(after 5s), will jump to card two.
-</p>
-</card>
-<card id="card2">
-This is Card two
-</card>
-</wml>
+    <head>
+        <meta http-equiv="Cache-Control" content="max-age=0"/>
+    </head>
 
+    <card id="card1" ontimer="#card2" title="Card one">
+        <p>Test for card ontimer intrinsic event in WML</p>
+        <timer name="time1" value="50"/>
+        <p>
+            This is card one<br/>
+            The timer is triggered by the ontimer intrinsic event(ontimer as attribute of card element)<br/>
+            When the timer is timeout(after 5s), will jump to card two.
+        </p>
+    </card>
+
+    <card id="card2">
+        This is Card two
+    </card>
+</wml>
diff --git a/WebCore/manual-tests/wml/deck-access-control.wml b/WebCore/manual-tests/wml/deck-access-control.wml
index 8158f18..a71e108 100644
--- a/WebCore/manual-tests/wml/deck-access-control.wml
+++ b/WebCore/manual-tests/wml/deck-access-control.wml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card onenterforward="targetdeck.wml">
-<p> Test for Deck Access control in WML. </p>
-<p> This deck will try to jump to "targetdeck.wml" when it is loaded. But it will <strong>FAIL</strong> because "targetdeck.wml" just allows "access-target.wml" to access it.</p>
-<p> You can click 'Go' to enter 'access-target.wml', and then enter 'targetdeck.wml' from there</p>
-<anchor title="go to access-target.wml"><go href="./access-target.wml">Go</go></anchor>
-</card>
+    <card onenterforward="targetdeck.wml">
+        <p>Test for Deck Access control in WML. </p>
+        <p>This deck will try to jump to "targetdeck.wml" when it is loaded. But it will <strong>FAIL</strong> because "targetdeck.wml" just allows "access-target.wml" to access it.</p>
+        <p>You can click 'Go' to enter 'access-target.wml', and then enter 'targetdeck.wml' from there</p>
+        <anchor title="go to access-target.wml"><go href="./access-target.wml">Go</go></anchor>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/go-element.wml b/WebCore/manual-tests/wml/go-element.wml
deleted file mode 100644
index 33ea41a..0000000
--- a/WebCore/manual-tests/wml/go-element.wml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-<wml>
- <card id="card1" title="One">
-  <p> Test for go element in WML </p>
-  <br/>
-  Case 1: jump among one deck
-  <do name="go" type="accept" label="Go to card2">
-   <go href="#card2" sendreferer="true" />
-  </do>
-  <p/>
-  Case 2: jump from one deck to another one
-  <do name="go2" type="accept" label="Go to test.wml">
-   <go href="../test.wml"/>
-  </do>
-  <p/>
-  Case 3: jump to test.wml and post data with post method
-  <do name="go3" type="accept" label="Post to test.wml">
-   <go href="../test.wml" method="post" accept-charset="utf-8, latin1">
-    <postfield name="var1" value="hello"/>
-    <postfield name="var2" value=" world"/>
-   </go>
-  </do>
-  <p/>
-  Case 4: jump to test.wml and send request with get method 
-  <do name="go4" type="accept" label="get from test.wml" sendreferer="true">
-   <go href="../test.wml" method="get" accept-charset="utf-8,latin1,iso-8859-1">
-    <postfield name="var1" value="hello"/>
-    <postfield name="var2" value="friend"/>
-   </go>
-  </do>
- </card>
-
- <card id="card2" title="Two">
-  <p align="center">
-  This is the second card
- </p>
- </card>
-</wml>
-
diff --git a/WebCore/manual-tests/wml/input-emptyok.wml b/WebCore/manual-tests/wml/input-emptyok.wml
deleted file mode 100644
index e2d7a1e..0000000
--- a/WebCore/manual-tests/wml/input-emptyok.wml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
-<wml>
-<card>
-<p> Test for input emptyok attribute in WML </p>
-For the following input elements, input is required:
-<br/>
-format=N*M;emptyok=false<input name="x2" emptyok="false" format="N*M"/>
-<br/>
-format=*M;emptyok=false<input name="x3" emptyok="false" format="*M"/>
-<br/>
-For the following input elements, input is not required:
-<br/>
-default<input name="x4"/> 
-<br/>
-format=*M<input name="x5" format="*M"/> 
-<br/>
-emptyok=true<input name="x6" emptyok="true"/>
-<br/>
-format=n*M;emptyok=true<input name="x7" emptyok="true" format="n*M"/>
-<br/>
-format=*M;emptyok=true<input name="x8" emptyok="true" format="*M"/>
-</card>
-</wml>
diff --git a/WebCore/manual-tests/wml/input-format.wml b/WebCore/manual-tests/wml/input-format.wml
index a916ec5..d51ddfd 100644
--- a/WebCore/manual-tests/wml/input-format.wml
+++ b/WebCore/manual-tests/wml/input-format.wml
@@ -1,37 +1,22 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN""http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card title="Input">
-<p> Test for input format in WML</p>
-<p>
-Password(default:*M):<input name="default"/>
-<br/>
-Password(6M): <input name="Pwd" type="password" format="6M"/>
-<br/>
-Password(AAa): <input name="Pwd2" type="password" format="AAa"/> 
-<br/>
-one-numeric+lowercase(N*a):<input name="upper" format="N*a"/> 
-<br/>
-Uppercase+non-numeric(AAA;size=8):<input name="upper" size="8" format="AAA"/> 
-<br/>
-Lowercase+non-numeric(aaa;size=8;width=2):<input name="lower" size="8" width="2" format="aaa"/>
-<br/>
-Numeric(5N;maxlen=3):<input name="numeric" maxlength="3" format="5N"/>
-<br/>
-Numeirc+symbols(nnn):<input name="numeric+" format="nnn"/>
-<br/>
-Uppercase+numeric+symbols(XXX):<input name="upper+" format="XXX"/>
-<br/>
-Lowercase+numeric+symbols(xxx):<input name="lower+" format="xxx"/>
-<br/>
-Uppercase+numeric+symbols(MMM):<input name="def_upper+" format="MMM"/>
-<br/>
-Lowercase+numeric+symbols(mmm):<input name="def_lower+" format="mmm"/>
-<br/>
-Mixed data(a\-NN*x)<input name="any" format="a\-NN*x"/>
-<br/>
-</p>
-</card>
+    <card title="Input">
+        <p>Test for input format in WML</p>
+        <p>
+            Password(default:*M):<input name="default"/><br/>
+            Password(6M): <input name="Pwd" type="password" format="6M"/><br/>
+            Password(AAa): <input name="Pwd2" type="password" format="AAa"/><br/>
+            one-numeric+lowercase(N*a):<input name="upper" format="N*a"/><br/>
+            Uppercase+non-numeric(AAA;size=8):<input name="upper" size="8" format="AAA"/><br/>
+            Lowercase+non-numeric(aaa;size=8;width=2):<input name="lower" size="8" width="2" format="aaa"/><br/>
+            Numeric(5N;maxlen=3):<input name="numeric" maxlength="3" format="5N"/><br/>
+            Numeric+symbols(nnn):<input name="numeric+" format="nnn"/><br/>
+            Uppercase+numeric+symbols(XXX):<input name="upper+" format="XXX"/><br/>
+            Lowercase+numeric+symbols(xxx):<input name="lower+" format="xxx"/><br/>
+            Uppercase+numeric+symbols(MMM):<input name="def_upper+" format="MMM"/><br/>
+            Lowercase+numeric+symbols(mmm):<input name="def_lower+" format="mmm"/><br/>
+            Mixed data(a\-NN*x)<input name="any" format="a\-NN*x"/><br/>
+        </p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/onevent-go.wml b/WebCore/manual-tests/wml/onevent-go.wml
index 5fd6b34..0fd2458 100644
--- a/WebCore/manual-tests/wml/onevent-go.wml
+++ b/WebCore/manual-tests/wml/onevent-go.wml
@@ -1,20 +1,17 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
+    <card id="card1" title="Card 1"> 
+        <onevent type="onenterforward">
+            <go href="#card2"/>
+        </onevent>
+        <p>Test for onevent element which binds go task with onenterforward event</p>
+        <p>when enter forward to this card, it will jump to card 2</p>
+    </card>
 
-<card id="card1" title="Card 1"> 
- <onevent type="onenterforward">
-  <go href="#card2"/>
- </onevent>
-<p>Test for onevent element which binds go task with onenterforward event</p>
-<p>when enter forward to this card, it will jump to card 2</p>
-</card>
-<card id="card2" title="Card 2">
-<p>Test for onevent element which binds go task with onenterforward event</p>
-<p>while card 1 is loaded, it will trigger the onenterforward event and jump to card2 immediately</p>
-<p>This is card2</p>
-</card>
-
+    <card id="card2" title="Card 2">
+        <p>Test for onevent element which binds go task with onenterforward event</p>
+        <p>while card 1 is loaded, it will trigger the onenterforward event and jump to card2 immediately</p>
+        <p>This is card2</p>
+    </card>
 </wml> 
-
diff --git a/WebCore/manual-tests/wml/onevent-noop.wml b/WebCore/manual-tests/wml/onevent-noop.wml
index 4b373c3..a072916 100644
--- a/WebCore/manual-tests/wml/onevent-noop.wml
+++ b/WebCore/manual-tests/wml/onevent-noop.wml
@@ -1,14 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-
-<card id="card1" title="Card 1"> 
- <onevent type="onenterforward">
- <noop/>
- </onevent>
-<p>Test for onevent element which binds noop task with onenterforward event</p>
-<p>when enter forward to this card, it won't do anything as if the onenterforward event wasn't triggered</p>
-</card>
+    <card id="card1" title="Card 1"> 
+        <onevent type="onenterforward">
+            <noop/>
+        </onevent>
+        <p>Test for onevent element which binds noop task with onenterforward event</p>
+        <p>when enter forward to this card, it won't do anything as if the onenterforward event wasn't triggered</p>
+    </card>
 </wml> 
-
diff --git a/WebCore/manual-tests/wml/onevent-prev.wml b/WebCore/manual-tests/wml/onevent-prev.wml
index 4e8182b..6c909c2 100644
--- a/WebCore/manual-tests/wml/onevent-prev.wml
+++ b/WebCore/manual-tests/wml/onevent-prev.wml
@@ -1,22 +1,19 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
+    <card id="card1" title="Card 1"> 
+        <p>Test for onevent element which binds prev task with onenterforward event</p>
+        <p>Clicking "Go" will cause it to jump to the card2, but which binds prev task to onenterforward event within onevent element, as a result, it will jump back to card 1</p>
+        <anchor title="Go to card2">Go
+            <go href="#card2"/>
+        </anchor>
+    </card>
 
-<card id="card1" title="Card 1"> 
-<p>Test for onevent element which binds prev task with onenterforward event</p>
-<p>Clicking "Go" will cause it to jump to the card2, but which binds prev task to onenterforward event within onevent element, as a result, it will jump back to card 1</p>
-<anchor title="Go to card2">Go
-<go href="#card2"/>
-</anchor>
-</card>
-
-<card id="card2" title="Card 2">
-<p>Test for onevent element which binds prev task with onenterforward event</p>
-<p>This is card2. When card 2 is entered forward, it will jump back to the previous page </p>
- <onevent type="onenterforward">
- <prev/>
- </onevent>
-</card>
+    <card id="card2" title="Card 2">
+        <p>Test for onevent element which binds prev task with onenterforward event</p>
+        <p>This is card2. When card 2 is entered forward, it will jump back to the previous page</p>
+        <onevent type="onenterforward">
+            <prev/>
+        </onevent>
+    </card>
 </wml> 
-
diff --git a/WebCore/manual-tests/wml/onevent-refresh.wml b/WebCore/manual-tests/wml/onevent-refresh.wml
index 4ad0781..7ca57f0 100644
--- a/WebCore/manual-tests/wml/onevent-refresh.wml
+++ b/WebCore/manual-tests/wml/onevent-refresh.wml
@@ -1,18 +1,16 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
+    <card id="card1" title="Card 1"> 
+        <timer name="T" value="30"/>
+        <onevent type="ontimer">
+            <refresh>
+                <setvar name="var" value="VARIABLE"/>
+            </refresh>
+        </onevent>
 
-<card id="card1" title="Card 1"> 
- <timer name="T" value="30"/>
- <onevent type="ontimer">
- <refresh>
- <setvar name="var" value="VARIABLE"/>
- </refresh>
- </onevent>
-<p>Test for onevent element which binds refresh task with ontimer event</p>
-<p> When the timer timeout(3s), the page will be refresh. As a consequence, we can see the following variable reference has been substituted</p>
-<p align="center"> Here is a variable : var = $var </p>
-</card>
+        <p>Test for onevent element which binds refresh task with ontimer event</p>
+        <p>When the timer timeout(3s), the page will be refresh. As a consequence, we can see the following variable reference has been substituted</p>
+        <p align="center"> Here is a variable : var = $var</p>
+    </card>
 </wml> 
-
diff --git a/WebCore/manual-tests/wml/onevent-shadow.wml b/WebCore/manual-tests/wml/onevent-shadow.wml
index bfaaa2a..cdd0459 100644
--- a/WebCore/manual-tests/wml/onevent-shadow.wml
+++ b/WebCore/manual-tests/wml/onevent-shadow.wml
@@ -1,23 +1,28 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<template>
-<onevent type="onenterforward">
-<go href="#card2"/>
-</onevent>
-</template>
-<card id="card1" title="Card One">
-<onevent type="onenterforward">
-<go href="#card3"/>
-</onevent>
-<p>Test for onevent shadowing in WML</p>
-<p>The card-level onevent will shadow the deck-level onevent. As a result, card 1 won't jump to card2  but to card 3 according to the card-level onevent's requirement. After entered the card 3, the deck-level onevent element isn't shadowed by this card, so it will jump to card 2 immediately.</p>
-</card>
-<card id="card2" title="Card two" >
-<p>This is card 2</p>
-</card>
-<card id="card3" title="Card Three">
-<p>This is card 3</p>
-</card>
+    <template>
+        <onevent type="onenterforward">
+            <go href="#card2"/>
+        </onevent>
+    </template>
+
+    <card id="card1" title="Card One">
+        <onevent type="onenterforward">
+            <go href="#card3"/>
+        </onevent>
+
+        <p>Test for onevent shadowing in WML</p>
+        <p>The card-level onevent will shadow the deck-level onevent. As a result, card 1 won't jump to card2 but
+           to card 3 according to the card-level onevent's requirement. After entered the card 3, the deck-level onevent
+           element isn't shadowed by this card, so it will jump to card 2 immediately.</p>
+    </card>
+
+    <card id="card2" title="Card two" onenterforward="">
+        <p>This is card 2</p>
+    </card>
+
+    <card id="card3" title="Card Three">
+        <p>This is card 3</p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/postfield-get.wml b/WebCore/manual-tests/wml/postfield-get.wml
deleted file mode 100644
index 38e1043..0000000
--- a/WebCore/manual-tests/wml/postfield-get.wml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml"><wml>
-<card>
-<p>Test for postfield element in WML </p>
-<p>
- Click "Get" to Send data by get method<br />
- <do type="accept" label="Get">
-  <go href="../test.wml" method="get">
-   <postfield name="i" value="2"/>
-   <postfield name="j" value="30"/>
-  </go>
- </do>
-</p>
-</card>
-</wml> 
diff --git a/WebCore/manual-tests/wml/postfield-post.wml b/WebCore/manual-tests/wml/postfield-post.wml
deleted file mode 100644
index 90dc6ca..0000000
--- a/WebCore/manual-tests/wml/postfield-post.wml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-<wml>
-<card id="card1" title="card1">
-<p>Test for postfield element in WML</p>
-<p>
- Click "Post" to Send data with post method<br/>
- <do type="accept" name="Ok" label="Post">
-  <go href="../test.wml" method="post">
-   <postfield name="i" value="2"/>
-   <postfield name="j" value="30"/>
-  </go>
- </do>
-</p>
-</card>
-</wml> 
diff --git a/WebCore/manual-tests/wml/resources/smiley.png b/WebCore/manual-tests/wml/resources/smiley.png
new file mode 100644
index 0000000..5bcc67a
--- /dev/null
+++ b/WebCore/manual-tests/wml/resources/smiley.png
diff --git a/WebCore/manual-tests/wml/select-element.wml b/WebCore/manual-tests/wml/select-element.wml
index e6dd98b..ca66cdb 100644
--- a/WebCore/manual-tests/wml/select-element.wml
+++ b/WebCore/manual-tests/wml/select-element.wml
@@ -1,27 +1,24 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card id="card1" title="Select Test">
-<p> Test for select element in WML </p>
-<p> You can select one or more options, and then click 'Answer', the second card will tell you what you selected</p>
-<p>
-<select name="cars" title="SELECT" multiple="true" >
-  <option value="volvo" >Volvo</option>
-  <option value="fiat">Fiat</option>
-  <option value="saab">Saab</option>
-  <option value="audi">Audi</option>
-</select>
-</p>
-<do type="accept" label="Answer">
-  <go href="#card2"/>
-</do>
-</card>
+    <card id="card1" title="Select Test">
+        <p>Test for select element in WML</p>
+        <p>You can select one or more options, and then click 'Answer', the second card will tell you what you selected</p>
+        <p>
+            <select name="cars" title="SELECT" multiple="true">
+                <option value="volvo" >Volvo</option>
+                <option value="fiat">Fiat</option>
+                <option value="saab">Saab</option>
+                <option value="audi">Audi</option>
+            </select>
+        </p>
+
+        <do type="accept" label="Answer">
+            <go href="#card2"/>
+        </do>
+    </card>
 
-<card id="card2" title="Answer">
-<p>
-You selected: $(cars)
-</p>
-</card>
+    <card id="card2" title="Answer">
+        <p>You selected: $(cars)</p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/select-onpick-event.wml b/WebCore/manual-tests/wml/select-onpick-event.wml
index 60c25e8..0def1a7 100644
--- a/WebCore/manual-tests/wml/select-onpick-event.wml
+++ b/WebCore/manual-tests/wml/select-onpick-event.wml
@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card>
-<p> Test for select onpick intrinsic event in WML </p>
-<p> When you select the 'Lion' option, will jump to test.wml</p>
-Please choose your favourite animal:<br/>
-<select name="X" multiple="true">
-<option value="D">Dog</option>
-<option value="C">Cat</option>
-<option value="L" onpick="../test.wml">Lion</option>
-</select>
-</card>
+    <card>
+        <p>Test for select onpick intrinsic event in WML</p>
+        <p>When you select the 'Lion' option, will jump to StartTests.wml</p>
+        Please choose your favourite animal:<br/>
+        <select name="X" multiple="true">
+            <option value="D">Dog</option>
+            <option value="C">Cat</option>
+            <option value="L" onpick="StartTests.wml">Lion</option>
+        </select>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/setvar-element.wml b/WebCore/manual-tests/wml/setvar-element.wml
index fe752cc..d78f20e 100644
--- a/WebCore/manual-tests/wml/setvar-element.wml
+++ b/WebCore/manual-tests/wml/setvar-element.wml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
- <card id="firstcard" title="Test for Setvar element">
- <p> Test for setvar element in WML </p>
- <p>This is the first card , has variable: VAR='$var'</p>
- <p>Click "Refresh" will update the value of VAR varaible which specified by setvar element</p>
-  <do name="Refresh" type="accept"> 
-   <refresh>
-   <setvar name="var" value="VALUE"/>
-   </refresh>
-  </do>
- </card>
-</wml>
+    <card id="firstcard" title="Test for Setvar element">
+        <p>Test for setvar element in WML </p>
+        <p>This is the first card , has variable: VAR='$var'</p>
+        <p>Click "Refresh" will update the value of VAR varaible which specified by setvar element</p>
 
+        <do name="Refresh" type="accept"> 
+            <refresh>
+                <setvar name="var" value="VALUE"/>
+            </refresh>
+        </do>
+    </card>
+</wml>
diff --git a/WebCore/manual-tests/wml/targetdeck.wml b/WebCore/manual-tests/wml/targetdeck.wml
index 3c45edb..1da2dbe 100644
--- a/WebCore/manual-tests/wml/targetdeck.wml
+++ b/WebCore/manual-tests/wml/targetdeck.wml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<head>
-<access domain="localhost" path="access-target.wml"/>
-</head>
-<card>
-<p> Test for Deck Access control in WML. </p>
-<p> This is the targetdeck, only './access-target.wml" can access me </p>
-</card>
+    <head>
+        <access domain="localhost" path="access-target.wml"/>
+    </head>
+
+    <card>
+        <p>Test for Deck Access control in WML.</p>
+        <p>This is the targetdeck, only './access-target.wml" can access me</p>
+        <a href="StartTests.wml">Next page</a>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/task-go-in-anchor.wml b/WebCore/manual-tests/wml/task-go-in-anchor.wml
index 706e3bf..a6578d4 100644
--- a/WebCore/manual-tests/wml/task-go-in-anchor.wml
+++ b/WebCore/manual-tests/wml/task-go-in-anchor.wml
@@ -1,13 +1,9 @@
 <?xml version="1.0" ?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card title="Anchor Tag">
-<p> Test for WML go task enclosed with anchor element </p>
-<p> click 'Next page' to go to test.wml </p>
-<p>
-<anchor>Next page<go href="../test.wml"/> </anchor>
-</p>
-</card>
+    <card title="Anchor Tag">
+        <p>Test for WML go task enclosed with anchor element</p>
+        <p>click 'Next page' to go to StartTests.wml</p>
+        <p><anchor>Next page<go href="StartTests.wml"/></anchor></p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/task-noop-in-do.wml b/WebCore/manual-tests/wml/task-noop-in-do.wml
deleted file mode 100644
index 105b0df..0000000
--- a/WebCore/manual-tests/wml/task-noop-in-do.wml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
-<wml>
-<card id="card1">
-<p> Test for Noop task in do element of WML. </p>
-<p> If it passes, you should not see the "Back" button</p>
- <do name="do" type="accept" label="Back">
- <noop/>
- </do>
-</card> 
-</wml> 
diff --git a/WebCore/manual-tests/wml/task-noop-in-onevent.wml b/WebCore/manual-tests/wml/task-noop-in-onevent.wml
deleted file mode 100644
index 5ba8af0..0000000
--- a/WebCore/manual-tests/wml/task-noop-in-onevent.wml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
-<wml>
-<card> 
-<p> Test for noop task in onevent element of WML</p>
-<p> If it passes, you will see the card one in this deck</p>
-  <onevent type="onentimer">
-  <noop/>
-  </onevent>
-<p> This is Card one </p>
-</card> 
-</wml> 
diff --git a/WebCore/manual-tests/wml/task-prev-in-anchor.wml b/WebCore/manual-tests/wml/task-prev-in-anchor.wml
index 3e0b331..3972b72 100644
--- a/WebCore/manual-tests/wml/task-prev-in-anchor.wml
+++ b/WebCore/manual-tests/wml/task-prev-in-anchor.wml
@@ -1,13 +1,11 @@
 <?xml version="1.0" ?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card title="Anchor Tag">
-<p> Test for WML prev task enclosed with anchor element </p>
-<p> click 'prev page' to go to previous page if it is not the first page in history</p>
-<p>
-<anchor>Prev page<prev/></anchor>
-</p>
-</card>
+    <card title="Anchor Tag">
+        <p>Test for WML prev task enclosed with anchor element </p>
+        <p>click 'prev page' to go to previous page if it is not the first page in history</p>
+        <p>
+            <anchor>Prev page<prev/></anchor>
+        </p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/task-refresh-in-anchor.wml b/WebCore/manual-tests/wml/task-refresh-in-anchor.wml
index 239f94a..48bb882 100644
--- a/WebCore/manual-tests/wml/task-refresh-in-anchor.wml
+++ b/WebCore/manual-tests/wml/task-refresh-in-anchor.wml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<card title="$T">
- <p> Test for refresh task within WML anchor element. <br/> click "Refresh" will refresh this page, as a result the page title will be updated. </p>
-  <p>
-   <anchor>
-    Refresh
-    <refresh>
-    <setvar name="T" value="Test refresh task"/>
-    </refresh>
-   </anchor>
-  </p>
-</card>
+    <card title="$T">
+        <p>Test for refresh task within WML anchor element.<br/>click "Refresh" will refresh this page, as a result the page title will be updated.</p>
+        <p>
+            <anchor>
+                Refresh
+                <refresh>
+                    <setvar name="T" value="Test refresh task"/>
+                </refresh>
+            </anchor>
+        </p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/template-go.wml b/WebCore/manual-tests/wml/template-go.wml
index 927e712..e8cca16 100644
--- a/WebCore/manual-tests/wml/template-go.wml
+++ b/WebCore/manual-tests/wml/template-go.wml
@@ -1,17 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-
 <wml>
-<template>
- <do name="go" type="accept" label="Template Go">
-  <go href="#card2"/>
- </do>
-</template>
-<card id="card1" title="Card 1">
-<p>Test for template element in WML. Template go button is global</p>
-<p> This is Card one, click 'Template Go' to jump to Card two</p>
-</card>
-<card id="card2" title="Card 2">
-<p>This is card two. <br/>The global template Go button is still visible for me</p>
-</card>
+    <template>
+        <do name="go" type="accept" label="Template Go">
+            <go href="#card2"/>
+        </do>
+    </template>
+
+    <card id="card1" title="Card 1">
+        <p>Test for template element in WML. Template go button is global</p>
+        <p>This is Card one, click 'Template Go' to jump to Card two</p>
+    </card>
+
+    <card id="card2" title="Card 2">
+        <p>This is card two.<br/>The global template Go button is still visible for me</p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/template-onevent.wml b/WebCore/manual-tests/wml/template-onevent.wml
deleted file mode 100644
index f21ca01..0000000
--- a/WebCore/manual-tests/wml/template-onevent.wml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-"http://www.wapforum.org/DTD/wml_1.1.xml">
-<wml>
-<template>
-<onevent type="onenterforward">
-<go href="#card2"/>
-</onevent>
-</template>
-<card id="card1">
-<p>Test for template element in WML</p>
-<p>When other page enter forward this page, it first show card 1, and then immediately jump to card 2 because of the template onenterforward event</p>
-</card>
-<card id="card2" title="card 2">
-<p>
-This is card 2
-</p>
-</card>
-</wml>
diff --git a/WebCore/manual-tests/wml/template-ontimer.wml b/WebCore/manual-tests/wml/template-ontimer.wml
index d72a8fd..b7c0ef6 100644
--- a/WebCore/manual-tests/wml/template-ontimer.wml
+++ b/WebCore/manual-tests/wml/template-ontimer.wml
@@ -2,16 +2,15 @@
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
 "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
-<template ontimer="#card2">
-</template>
-<card id="card1">
-<p>Test for template ontimer event in WML</p>
-<p>This is Card one,we will jump to card 2 after 5s because of the template ontimer event</p>
-<timer value="50"/>
-</card>
-<card id="card2" title="card 2">
-<p>
-This is card 2
-</p>
-</card>
+    <template ontimer="#card2"/>
+
+    <card id="card1">
+        <p>Test for template ontimer event in WML</p>
+        <p>This is Card one,we will jump to card 2 after 5s because of the template ontimer event</p>
+        <timer value="50"/>
+    </card>
+    
+    <card id="card2" title="card 2">
+        <p>This is card 2</p>
+    </card>
 </wml>
diff --git a/WebCore/manual-tests/wml/timer.wml b/WebCore/manual-tests/wml/timer.wml
index 8885934..fb47950 100644
--- a/WebCore/manual-tests/wml/timer.wml
+++ b/WebCore/manual-tests/wml/timer.wml
@@ -1,26 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-
 <wml>
-<head>
-<meta http-equiv="Cache-Control" content="max-age=0"/>
-</head>
-<card id="card1" ontimer="#card2" title="Card one">
-<p> This test case is used to test timer in WML </p>
-    <timer name="time1" value="50"/>
-    <p>
-    This is card one<br/>The timer is triggered by the ontimer intrinsic event(ontimer as attribute of card element)<br/>When the timer is timeout(after 5s), will jump to card two.
-    </p>
-</card>
+    <head>
+        <meta http-equiv="Cache-Control" content="max-age=0"/>
+    </head>
 
-<card id="card2" title="Card two">
-    <onevent type="ontimer">
-    <go href="#card1"/>
-    </onevent>
-    <timer name="timer2" value="30"/>
-    <p> 
-    This is card Two!<br/> The timer is triggered by the ontimer intrinsic event(ontimer is specified by onevent element)<br/>When the timer is timeout(after 3s), will jump back to card one.
-    </p>
-</card>
-</wml>
+    <card id="card1" ontimer="#card2" title="Card one">
+        <p>This test case is used to test timer in WML </p>
+        <timer name="time1" value="50"/>
+        <p>
+            This is card one<br/>
+            The timer is triggered by the ontimer intrinsic event(ontimer as attribute of card element)<br/>
+            When the timer is timeout(after 5s), will jump to card two.
+        </p>
+    </card>
 
+    <card id="card2" title="Card two">
+        <onevent type="ontimer">
+            <go href="#card1"/>
+        </onevent>
+        <timer name="timer2" value="30"/>
+
+        <p> 
+            This is card Two!<br/>
+            The timer is triggered by the ontimer intrinsic event(ontimer is specified by onevent element)<br/>
+            When the timer is timeout(after 3s), will jump back to card one.
+        </p>
+    </card>
+</wml>
diff --git a/WebCore/manual-tests/wml/variable-substitution.wml b/WebCore/manual-tests/wml/variable-substitution.wml
index 29d98c3..728f965 100644
--- a/WebCore/manual-tests/wml/variable-substitution.wml
+++ b/WebCore/manual-tests/wml/variable-substitution.wml
@@ -1,30 +1,33 @@
 <?xml version="1.0"?>
 <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
 <wml>
- <card id="card1" title="Test variable substitution">
- <p> Test for variable substitution </p>
- <p> Click "Refersh" to refresh the card, and the varaible references in the card will be substitued</p>
-  <anchor> Refresh <br/>
-  <refresh> 
-  <setvar name="hi" value="hello"/>
-  <setvar name="name" value=" Yi chao"/>
-  <setvar name="name2" value="$(name:e)"/>
-  <setvar name="name3" value="$(name2:u)"/>
-  </refresh>
-  </anchor>
-  <p>set hi = "hello", name = " Yi chao" <br/>
-  <![CDATA[$(hi),$name]]> => $(hi),$name <br/>
-  <![CDATA[$hi,$(name:esCape)]]> => $hi,$(name:esCape) <br/>
-  <![CDATA[$hi,$(name:e)]]> => $hi,$(name:e) <br/>
-  <![CDATA[$hi,$(name:U)]]> => $hi,$(name:U) <br/>
-  </p>
-  <p>set name2 = $$(name:e) <br/>
-  <![CDATA[$(hi),$(name2)]]> => $(hi),$(name2) <br/>
-  <![CDATA[$(hi),$$(name:e)]]> => $(hi),$$(name:e) <br/>
-  </p>
-  <p>set name3 = $$(name2:u) <br/>
-  <![CDATA[$(hi),$name3]]> => $(hi),$name3<br/>
-  <![CDATA[$(hi),$(name3:e)]]> => $(hi),$(name3:e) <br/>
-  </p>
- </card>
+    <card id="card1" title="Test variable substitution">
+        <p>Test for variable substitution</p>
+        <p>Click "Refersh" to refresh the card, and the varaible references in the card will be substitued</p>
+        <anchor>Refresh<br/>
+            <refresh> 
+                <setvar name="hi" value="hello"/>
+                <setvar name="name" value=" Yi chao"/>
+                <setvar name="name2" value="$(name:e)"/>
+                <setvar name="name3" value="$(name2:u)"/>
+            </refresh>
+        </anchor>
+
+        <p>set hi = "hello", name = " Yi chao"<br/>
+        <![CDATA[$(hi),$name]]> => $(hi),$name<br/>
+        <![CDATA[$hi,$(name:escape)]]> => $hi,$(name:escape)<br/>
+        <![CDATA[$hi,$(name:e)]]> => $hi,$(name:e)<br/>
+        <![CDATA[$hi,$(name:u)]]> => $hi,$(name:u)<br/>
+        </p>
+
+        <p>set name2 = $$(name:e)<br/>
+        <![CDATA[$(hi),$(name2)]]> => $(hi),$(name2)<br/>
+        <![CDATA[$(hi),$$(name:e)]]> => $(hi),$$(name:e)<br/>
+        </p>
+
+        <p>set name3 = $$(name2:u)<br/>
+        <![CDATA[$(hi),$name3]]> => $(hi),$name3<br/>
+        <![CDATA[$(hi),$(name3:e)]]> => $(hi),$(name3:e)<br/>
+        </p>
+    </card>
 </wml>