Changeset 83726 in webkit

Timestamp:

Apr 13, 2011 7:01:55 AM (13 years ago)

Author:

tonyg@chromium.org

Message:

2011-04-13 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by David Levin.

[chromium] Regression(r80861): fast/dom/Window/window-lookup-precedence.html started failing on Windows.
​https://bugs.webkit.org/show_bug.cgi?id=56608

Previously the test unintentionally navigated the iframe when setting
window.location. Instead, now, we just skip setting window.location.

• fast/dom/Window/window-lookup-precedence.html:
• platform/chromium-win/fast/dom/Window/window-lookup-precedence-expected.txt: Moved to chromium.
• platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt: Moved from chromium-win.
• platform/chromium/test_expectations.txt:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/Window/window-lookup-precedence.html (modified) (1 diff)
• platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt (moved) (moved from trunk/LayoutTests/platform/chromium-win/fast/dom/Window/window-lookup-precedence-expected.txt)
• platform/chromium/test_expectations.txt (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-13  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] Regression(r80861): fast/dom/Window/window-lookup-precedence.html started failing on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=56608
+
+        Previously the test unintentionally navigated the iframe when setting
+        window.location. Instead, now, we just skip setting window.location.
+
+        * fast/dom/Window/window-lookup-precedence.html:
+        * platform/chromium-win/fast/dom/Window/window-lookup-precedence-expected.txt: Moved to chromium.
+        * platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt: Moved from chromium-win.
+        * platform/chromium/test_expectations.txt:
+
 2011-04-13  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/fast/dom/Window/window-lookup-precedence.html

@@ -42 +42 @@
     if (name == "showModalDialog")
       return;
-    // Check subframe precedence.
-    try {
-      subframe[name] = name;
-    } catch (e) {
-      debug("Unable to set subframe[" + name + "]: " + e);
+    if (name != "location") { // Avoid navigating the subframe.
+      // Check subframe precedence.
+      try {
+        subframe[name] = name;
+      } catch (e) {
+        debug("Unable to set subframe[" + name + "]: " + e);
+      }
     }
     checkValue(name, original);

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1569 +1569 @@
 BUGCR18116 : svg/custom/global-constructors.html = TEXT
 
-// Flaky crashes
-BUGCR18656 MAC RELEASE : fast/dom/Window/window-lookup-precedence.html = FAIL
-BUGCR18656 MAC DEBUG : fast/dom/Window/window-lookup-precedence.html = FAIL
-
 // Test failures from WebKit merge 46894 to 46977
 BUGCR26737 : fast/js/prototypes.html = FAIL
@@ -3136 +3132 @@
 // Test changed in Wk r80743, throws an exception rather than returning 'true'
 BUGCR75740 : fast/js/regexp-test-null-string.html = FAIL
-
-BUGWK56608 WIN : fast/dom/Window/window-lookup-precedence.html = TEXT
 
 // Skip an overly restrictive cross-origin HTTPS test