Changeset 98685 in webkit

Timestamp:

Oct 27, 2011, 9:24:35 PM (15 years ago)

Author:

rniwa@webkit.org

Message:

Fix click-before-and-after-table.html for Chromium
​https://bugs.webkit.org/show_bug.cgi?id=70869

Reviewed by Tony Chang.

Fixed the test by wrapping tests in a function to avoid shadowing "top" variable.

• editing/selection/click-before-and-after-table.html:
• platform/chromium/test_expectations.txt:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/selection/click-before-and-after-table.html (modified) (4 diffs)
• platform/chromium/test_expectations.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Fix click-before-and-after-table.html for Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=70869
+
+        Reviewed by Tony Chang.
+
+        Fixed the test by wrapping tests in a function to avoid shadowing "top" variable.
+
+        * editing/selection/click-before-and-after-table.html:
+        * platform/chromium/test_expectations.txt:
+
 2011-10-27  John Gregg  <johnnyg@google.com>
 

trunk/LayoutTests/editing/selection/click-before-and-after-table.html

@@ -1 @@
-<script>
-if (window.layoutTestController)
-     layoutTestController.dumpEditingCallbacks();
-</script>
 <style>
 td {
@@ -12 +8 @@
 <ul id="console"></ul>
 <script>
+if (window.layoutTestController)
+     layoutTestController.dumpEditingCallbacks();
+
 function log(message) {
     var console = document.getElementById("console");
@@ -20 +19 @@
     li.appendChild(text);
 }
-if (!window.layoutTestController) {
-    log("This test uses the eventSender to do mouse clicks.  To run it manually, click after the table, the caret should appear there (and not inside the table).  Then click inside the table.  The caret should appear inside it.");
-    document.body.addEventListener("click", function() { var s = window.getSelection(); log("click @ " + event.clientX + ", " + event.clientY + " caret at: " + s.anchorNode + ", " + s.anchorOffset); }, true);
-} else {
+
+function runAutomatedTest() {
     window.layoutTestController.dumpAsText();
     var s, x, y, e, top, bottom, left, right;
@@ -73 +70 @@
         log("Failure: Clicking @ " + x + ", " + y + " inside the table put the caret before or after it.  Instead: " + s.anchorNode + ", " + s.anchorOffset);
 }
+
+if (window.layoutTestController)
+    runAutomatedTest();
+else {
+    log("This test uses the eventSender to do mouse clicks.  To run it manually, click after the table, the caret should appear there (and not inside the table).  Then click inside the table.  The caret should appear inside it.");
+    document.body.addEventListener("click", function() { var s = window.getSelection(); log("click @ " + event.clientX + ", " + event.clientY + " caret at: " + s.anchorNode + ", " + s.anchorOffset); }, true);
+}
+
 </script>
 </body>

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -479 +479 @@
 // supporting that option.
 WONTFIX SKIP : fast/parser/pre-html5-parser-quirks.html = FAIL
-
-// These tests have been rewritten, with the original being ignored,
-// because they rely on being able to shadow the 'top' variable on the
-// global object.  For security we disallow shadowing of top.
-WONTFIX SKIP : editing/selection/click-before-and-after-table.html = FAIL
 
 // We're taking a different approach on this test than Webkit does, related to