projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 427e9f1)
Unreviewed - re-enables tests on chromium-mac by making minor changes to cause the...
authordmazzoni@google.com <dmazzoni@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jan 2012 08:58:22 +0000 (08:58 +0000)
committerdmazzoni@google.com <dmazzoni@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jan 2012 08:58:22 +0000 (08:58 +0000)
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105392 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
LayoutTests/ChangeLog patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-global-point-main-window.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-global-point-nested.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow-expected.txt patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe-expected.txt patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window-expected.txt patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window.html patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus-expected.txt patch | blob | history
LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html patch | blob | history
LayoutTests/platform/chromium/test_expectations.txt patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7471897..6edaef9 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2012-01-19  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Unreviewed - re-enables tests on chromium-mac by making minor
+        changes to cause the expectations to be identical on all Chromium configurations.
+
+        https://bugs.webkit.org/show_bug.cgi?id=73460
+
+        * platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html:
+        * platform/chromium/accessibility/scroll-to-global-point-iframe.html:
+        * platform/chromium/accessibility/scroll-to-global-point-main-window.html:
+        * platform/chromium/accessibility/scroll-to-global-point-nested.html:
+        * platform/chromium/accessibility/scroll-to-make-visible-div-overflow-expected.txt:
+        * platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html:
+        * platform/chromium/accessibility/scroll-to-make-visible-iframe-expected.txt:
+        * platform/chromium/accessibility/scroll-to-make-visible-iframe.html:
+        * platform/chromium/accessibility/scroll-to-make-visible-main-window-expected.txt:
+        * platform/chromium/accessibility/scroll-to-make-visible-main-window.html:
+        * platform/chromium/accessibility/scroll-to-make-visible-with-subfocus-expected.txt:
+        * platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html:
+        * platform/chromium/test_expectations.txt:
+
 2012-01-19  Adam Barth  <abarth@webkit.org>
 
         createAttributeNS should understand that "xmlns" is allowed in the http://www.w3.org/2000/xmlns/
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html
index d734029..cdb0047 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html
@@ -11,6 +11,11 @@
 
 <!-- The contents of this iframe, more nicely formatted:
  <body>
+   <style>
+     button {
+       border: 0;
+     }
+   </style>
    <div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div>
    <div id='container' style='height: 100px; overflow: scroll'>
      <div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div>
@@ -20,7 +25,7 @@
    <div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div>
   </body>
  -->
-<iframe id="frame" src="data:text/html,<body><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div><div id='container' style='height: 100px; overflow: scroll'><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div><button id='target'>Target</button><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div></div><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div></body>"></iframe>
+<iframe id="frame" src="data:text/html,<body><style>button { border: 0; }</style><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div><div id='container' style='height: 100px; overflow: scroll'><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div><button id='target'>Target</button><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div></div><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div></body>"></iframe>
 
 <div style="border: 1px solid #000; height: 5000px;">5000-pixel box</div>
 
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe.html b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe.html
index 49a4887..0dbb429 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-iframe.html
@@ -9,7 +9,7 @@
 
 <div style="border: 1px solid #000; height: 5000px;">5000-pixel box</div>
 
-<iframe id="frame" src="data:text/html,<body><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div><button id='target'>Target</button><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div></body>"></iframe>
+<iframe id="frame" src="data:text/html,<body><style>button { border: 0; }</style><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div><button id='target'>Target</button><div style='border: 1px solid #000; height: 5000px;'>5000-pixel box</div></body>"></iframe>
 
 <div style="border: 1px solid #000; height: 5000px;">5000-pixel box</div>
 
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-main-window.html b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-main-window.html
index 5b17110..74301d2 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-main-window.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-main-window.html
@@ -2,6 +2,11 @@
 <head>
 <link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
+<style>
+button {
+  border: 0;
+}
+</style>
 </head>
 <body>
 
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-nested.html b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-nested.html
index 5c6ea82..4926716 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-nested.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-global-point-nested.html
@@ -2,6 +2,11 @@
 <head>
 <link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
+<style>
+button {
+  border: 0;
+}
+</style>
 </head>
 <body>
 
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow-expected.txt b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow-expected.txt
index cc2ea60..3a0f6a8 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow-expected.txt
@@ -7,10 +7,10 @@ Upper Target
 5000-pixel box
 Lower Target
 PASS container.scrollTop is 0
-PASS container.scrollTop is >= 4952
-PASS 5030 is >= container.scrollTop
-PASS container.scrollTop is >= -76
-PASS 2 is >= container.scrollTop
+PASS container.scrollTop >= minYOffset is true
+PASS container.scrollTop <= maxYOffset is true
+PASS container.scrollTop >= minYOffset is true
+PASS container.scrollTop <= maxYOffset is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html
index 333cbb1..497ce37 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html
@@ -38,19 +38,19 @@ function runTest() {
     if (window.accessibilityController)
         lowerTargetAccessibleObject.scrollToMakeVisible();
     var top = lowerTarget.offsetTop - container.offsetTop;
-    var minYOffset = top + lowerTarget.offsetHeight - container.offsetHeight;
-    var maxYOffset = top;
-    shouldBeGreaterThanOrEqual("container.scrollTop", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "container.scrollTop");
+    window.minYOffset = top + lowerTarget.offsetHeight - container.offsetHeight;
+    window.maxYOffset = top;
+    shouldBe("container.scrollTop >= minYOffset", "true");
+    shouldBe("container.scrollTop <= maxYOffset", "true");
 
     // Scroll to make upper target visible and check.
     if (window.accessibilityController)
         upperTargetAccessibleObject.scrollToMakeVisible();
     top = upperTarget.offsetTop - container.offsetTop;
-    minYOffset = top + upperTarget.offsetHeight - container.offsetHeight;
-    maxYOffset = top;
-    shouldBeGreaterThanOrEqual("container.scrollTop", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "container.scrollTop");
+    window.minYOffset = top + upperTarget.offsetHeight - container.offsetHeight;
+    window.maxYOffset = top;
+    shouldBe("container.scrollTop >= minYOffset", "true");
+    shouldBe("container.scrollTop <= maxYOffset", "true");
 
     finishJSTest();
 }
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe-expected.txt b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe-expected.txt
index 9b13028..ca325d5 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe-expected.txt
@@ -5,10 +5,10 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS frameWindow.pageYOffset is 0
-PASS frameWindow.pageYOffset is >= 4910
-PASS 5038 is >= frameWindow.pageYOffset
-PASS frameWindow.pageYOffset is >= -118
-PASS 10 is >= frameWindow.pageYOffset
+PASS frameWindow.pageYOffset >= minYOffset is true
+PASS frameWindow.pageYOffset <= maxYOffset is true
+PASS frameWindow.pageYOffset >= minYOffset is true
+PASS frameWindow.pageYOffset <= maxYOffset is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe.html b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe.html
index 41a0e39..208108e 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-iframe.html
@@ -41,18 +41,18 @@ function runTest() {
     // Scroll to make lower target visible and check.
     if (window.accessibilityController)
         lowerTargetAccessibleObject.scrollToMakeVisible();
-    var minYOffset = lowerTarget.offsetTop + lowerTarget.offsetHeight - frameWindow.innerHeight;
-    var maxYOffset = lowerTarget.offsetTop;
-    shouldBeGreaterThanOrEqual("frameWindow.pageYOffset", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "frameWindow.pageYOffset");
+    window.minYOffset = lowerTarget.offsetTop + lowerTarget.offsetHeight - frameWindow.innerHeight;
+    window.maxYOffset = lowerTarget.offsetTop;
+    shouldBe("frameWindow.pageYOffset >= minYOffset", "true");
+    shouldBe("frameWindow.pageYOffset <= maxYOffset", "true");
 
     // Scroll to make upper target visible and check.
     if (window.accessibilityController)
         upperTargetAccessibleObject.scrollToMakeVisible();
-    minYOffset = upperTarget.offsetTop + upperTarget.offsetHeight - frameWindow.innerHeight;
-    maxYOffset = upperTarget.offsetTop;
-    shouldBeGreaterThanOrEqual("frameWindow.pageYOffset", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "frameWindow.pageYOffset");
+    window.minYOffset = upperTarget.offsetTop + upperTarget.offsetHeight - frameWindow.innerHeight;
+    window.maxYOffset = upperTarget.offsetTop;
+    shouldBe("frameWindow.pageYOffset >= minYOffset", "true");
+    shouldBe("frameWindow.pageYOffset <= maxYOffset", "true");
 
     finishJSTest();
 }
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window-expected.txt b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window-expected.txt
index 0e61812..8c5c935 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window-expected.txt
@@ -7,10 +7,10 @@ Upper Target
 5000-pixel box
 Lower Target
 PASS window.pageYOffset is 0
-PASS window.pageYOffset is >= 4532
-PASS 5110 is >= window.pageYOffset
-PASS window.pageYOffset is >= -496
-PASS 82 is >= window.pageYOffset
+PASS window.pageYOffset >= minYOffset is true
+PASS window.pageYOffset <= maxYOffset is true
+PASS window.pageYOffset >= minYOffset is true
+PASS window.pageYOffset <= maxYOffset is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window.html b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window.html
index 383bd13..854b2ee 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-main-window.html
@@ -34,18 +34,18 @@ function runTest() {
     // Scroll to make lower target visible and check.
     if (window.accessibilityController)
         lowerTargetAccessibleObject.scrollToMakeVisible();
-    var minYOffset = lowerTarget.offsetTop + lowerTarget.offsetHeight - window.innerHeight;
-    var maxYOffset = lowerTarget.offsetTop;
-    shouldBeGreaterThanOrEqual("window.pageYOffset", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "window.pageYOffset");
+    window.minYOffset = lowerTarget.offsetTop + lowerTarget.offsetHeight - window.innerHeight;
+    window.maxYOffset = lowerTarget.offsetTop;
+    shouldBe("window.pageYOffset >= minYOffset", "true");
+    shouldBe("window.pageYOffset <= maxYOffset", "true");
 
     // Scroll to make upper target visible and check.
     if (window.accessibilityController)
         upperTargetAccessibleObject.scrollToMakeVisible();
-    minYOffset = upperTarget.offsetTop + upperTarget.offsetHeight - window.innerHeight;
-    maxYOffset = upperTarget.offsetTop;
-    shouldBeGreaterThanOrEqual("window.pageYOffset", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "window.pageYOffset");
+    window.minYOffset = upperTarget.offsetTop + upperTarget.offsetHeight - window.innerHeight;
+    window.maxYOffset = upperTarget.offsetTop;
+    shouldBe("window.pageYOffset >= minYOffset", "true");
+    shouldBe("window.pageYOffset <= maxYOffset", "true");
 
     finishJSTest();
 }
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus-expected.txt b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus-expected.txt
index d3f6e33..2fd7816 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus-expected.txt
@@ -6,8 +6,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 5000-pixel box
 Target
 PASS window.pageYOffset is 0
-PASS window.pageYOffset is >= 6982
-PASS 7582 is >= window.pageYOffset
+PASS window.pageYOffset >= minYOffset is true
+PASS window.pageYOffset <= maxYOffset is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html
index 13bbefb..bf6b832 100644 (file)
--- a/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html
+++ b/LayoutTests/platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html
@@ -30,10 +30,10 @@ function runTest() {
     // Scroll to make the midpoint of the target visible and check.
     if (window.accessibilityController)
         targetAccessibleObject.scrollToMakeVisibleWithSubFocus(0, 2500, 100, 2600);
-    var minYOffset = target.offsetTop + 2500 - window.innerHeight;
-    var maxYOffset = target.offsetTop + 2500;
-    shouldBeGreaterThanOrEqual("window.pageYOffset", "" + minYOffset);
-    shouldBeGreaterThanOrEqual("" + maxYOffset, "window.pageYOffset");
+    window.minYOffset = target.offsetTop + 2500 - window.innerHeight;
+    window.maxYOffset = target.offsetTop + 2500;
+    shouldBe("window.pageYOffset >= minYOffset", "true");
+    shouldBe("window.pageYOffset <= maxYOffset", "true");
 
     finishJSTest();
 }
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 45d3192..fca14ae 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3854,15 +3854,6 @@ BUGWK76558 : svg/dom/SVGScriptElement/script-load-and-error-events.svg = PASS TE
 
 BUGWK76580 : media/media-document-audio-repaint.html = IMAGE PASS
 
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-make-visible-div-overflow.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-make-visible-main-window.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-global-point-iframe-nested.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-global-point-main-window.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-global-point-nested.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-global-point-iframe.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-make-visible-with-subfocus.html = TEXT
-BUGWK73460 MAC : platform/chromium/accessibility/scroll-to-make-visible-iframe.html = TEXT
-
 BUGWK76562 : fast/canvas/webgl/drawingbuffer-test.html = TEXT
 
 BUGWK76446 : svg/text/select-x-list-4.svg = IMAGE+TEXT
Domain: Web Framework / Uncategorized;