Commit 5f1fc2f4 authored by Dominic Mazzoni's avatar Dominic Mazzoni Committed by Commit Bot

Fix all of the AccessibilityIframeTransform* content_browsertests

The flakiness was all due to the main browser window not being consistently
800 x 600. This was affecting any accessibility test that was asserting
anything about the clipped bounding box of a node with a y-coordinate
greater than 600, for example.

The solution is to make the dimensions of things a bit smaller so
tests aren't more than 600 pixels tall, and to tighten up the
expectations so we aren't relying on anything that might flake.

TBR=katie@chromium.org

Bug: 856566
Change-Id: I391a880c476d3570a97aef1732cd5f2c6de422e4
Reviewed-on: https://chromium-review.googlesource.com/1142532Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576397}
parent 0bdf9c54
...@@ -1258,14 +1258,8 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, ...@@ -1258,14 +1258,8 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
RunHtmlTest(FILE_PATH_LITERAL("iframe-presentational.html")); RunHtmlTest(FILE_PATH_LITERAL("iframe-presentational.html"));
} }
#if defined(OS_WIN)
// Flaky; https://crbug.com/856566.
#define MAYBE_AccessibilityIframeTransform DISABLED_AccessibilityIframeTransform
#else
#define MAYBE_AccessibilityIframeTransform AccessibilityIframeTransform
#endif
IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
MAYBE_AccessibilityIframeTransform) { AccessibilityIframeTransform) {
RunHtmlTest(FILE_PATH_LITERAL("iframe-transform.html")); RunHtmlTest(FILE_PATH_LITERAL("iframe-transform.html"));
} }
...@@ -1274,29 +1268,13 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, ...@@ -1274,29 +1268,13 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-cross-process.html")); RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-cross-process.html"));
} }
#if defined(OS_WIN)
// Flaky; https://crbug.com/856566.
#define MAYBE_AccessibilityIframeTransformNested \
DISABLED_AccessibilityIframeTransformNested
#else
#define MAYBE_AccessibilityIframeTransformNested \
AccessibilityIframeTransformNested
#endif
IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
MAYBE_AccessibilityIframeTransformNested) { AccessibilityIframeTransformNested) {
RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-nested.html")); RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-nested.html"));
} }
#if defined(OS_WIN)
// Flaky; https://crbug.com/856566.
#define MAYBE_AccessibilityIframeTransformNestedCrossProcess \
DISABLED_AccessibilityIframeTransformNestedCrossProcess
#else
#define MAYBE_AccessibilityIframeTransformNestedCrossProcess \
AccessibilityIframeTransformNestedCrossProcess
#endif
IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
MAYBE_AccessibilityIframeTransformNestedCrossProcess) { AccessibilityIframeTransformNestedCrossProcess) {
RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-nested-cross-process.html")); RunHtmlTest(FILE_PATH_LITERAL("iframe-transform-nested-cross-process.html"));
} }
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body style="margin: 10px; padding: 0px; border: 0px;"> <body style="margin: 10px; padding: 0px; border: 0px;">
<div role="img" style="width: 200px; height: 200px; background-color: #fef;"></div> <div role="img" style="width: 100px; height: 50px; background-color: #fef;"></div>
</body> </body>
</html> </html>
rootWebArea pageLocation=(0, 0) rootWebArea pageLocation=(0, 0)
++iframe pageLocation=(0, 0) ++iframe pageLocation=(0, 0)
++++rootWebArea pageLocation=(0, 0) ++++rootWebArea pageLocation=(0, 0)
++++++image pageLocation=(10, 10) pageSize=(200, 200) ++++++image pageLocation=(10, 10) pageSize=(100, 50)
++iframe pageLocation=(0, 250) transform ++iframe pageLocation=(0, 250) transform
++++rootWebArea pageLocation=(0, 250) ++++rootWebArea pageLocation=(0, 250)
++++++image pageLocation=(15, 265) pageSize=(300, 300) ++++++image pageLocation=(15, 265) pageSize=(150, 75)
<!-- <!--
@BLINK-ALLOW:pageLocation* @BLINK-ALLOW:pageLocation*
@BLINK-ALLOW:pageSize=(200, 200) @BLINK-ALLOW:pageSize=(100, 50)
@BLINK-ALLOW:pageSize=(300, 300) @BLINK-ALLOW:pageSize=(150, 75)
@BLINK-ALLOW:transform @BLINK-ALLOW:transform
There are two iframes that each include box.html, one with no transform,
and one with a transform of 1.5 applied. Both iframes are cross-process.
The image in box.html is at (10, 10) size (100 x 50)
Inside the first iframe it should be at (10, 10) size (100 x 50)
Inside the second iframe it should be at (15, 265) size (150 x 75)
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
......
rootWebArea pageLocation=(0, 0) rootWebArea pageLocation=(0, 0)
++iframe pageLocation=(0, 0) ++iframe pageLocation=(0, 0)
++++rootWebArea pageLocation=(0, 0) ++++rootWebArea pageLocation=(0, 0)
++++++image pageLocation=(10, 10) pageSize=(200, 200) ++++++image pageLocation=(10, 10) pageSize=(100, 50)
++iframe pageLocation=(0, 250) transform ++iframe pageLocation=(0, 250) transform
++++rootWebArea pageLocation=(0, 250) ++++rootWebArea pageLocation=(0, 250)
++++++image pageLocation=(15, 265) pageSize=(300, 300) ++++++image pageLocation=(15, 265) pageSize=(150, 75)
ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE location=(0, 0) size=(800, 600) ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE location=(0, 0)
++IA2_ROLE_INTERNAL_FRAME READONLY location=(0, 0) size=(220, 220) ++IA2_ROLE_INTERNAL_FRAME READONLY location=(0, 0)
++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE location=(0, 0) size=(220, 220) ++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE location=(0, 0)
++++++ROLE_SYSTEM_GRAPHIC READONLY location=(10, 10) size=(200, 200) ++++++ROLE_SYSTEM_GRAPHIC READONLY location=(10, 10) size=(100, 50)
++IA2_ROLE_INTERNAL_FRAME READONLY location=(0, 250) size=(330, 330) ++IA2_ROLE_INTERNAL_FRAME READONLY location=(0, 250)
++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE location=(0, 250) size=(330, 330) ++++ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE location=(0, 250)
++++++ROLE_SYSTEM_GRAPHIC READONLY location=(15, 265) size=(300, 300) ++++++ROLE_SYSTEM_GRAPHIC READONLY location=(15, 265) size=(150, 75)
...@@ -3,4 +3,4 @@ rootWebArea pageLocation=(0, 0) ...@@ -3,4 +3,4 @@ rootWebArea pageLocation=(0, 0)
++++rootWebArea pageLocation=(0, 100) ++++rootWebArea pageLocation=(0, 100)
++++++iframe pageLocation=(200, 100) transform ++++++iframe pageLocation=(200, 100) transform
++++++++rootWebArea pageLocation=(200, 100) ++++++++rootWebArea pageLocation=(200, 100)
++++++++++image pageLocation=(240, 140) pageSize=(560, 460) ++++++++++image pageLocation=(240, 140) pageSize=(400, 200)
<!-- <!--
@BLINK-ALLOW:pageLocation* @BLINK-ALLOW:pageLocation*
@BLINK-ALLOW:pageSize=(560, 460) @BLINK-ALLOW:pageSize=(400, 200)
@BLINK-ALLOW:transform @BLINK-ALLOW:transform
This is the same as iframe-transform-nested.html except that the
iframes are cross-process rather than being from the same site.
This page includes frame/nested-cross-process-frame.html in an iframe,
and that page includes frame/box.html in an iframe.
Both pages absolute-position the iframe and give it a scale
factor of 2.0.
The image in box.html is at (10, 10) size (100 x 50)
Relative to nested-frame.html it's at (120, 20) size (200 x 100)
Relative to this file it's at (240, 140) size (400 x 200)
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
......
...@@ -3,4 +3,4 @@ rootWebArea pageLocation=(0, 0) ...@@ -3,4 +3,4 @@ rootWebArea pageLocation=(0, 0)
++++rootWebArea pageLocation=(0, 100) ++++rootWebArea pageLocation=(0, 100)
++++++iframe pageLocation=(200, 100) transform ++++++iframe pageLocation=(200, 100) transform
++++++++rootWebArea pageLocation=(200, 100) ++++++++rootWebArea pageLocation=(200, 100)
++++++++++image pageLocation=(240, 140) pageSize=(560, 460) ++++++++++image pageLocation=(240, 140) pageSize=(400, 200)
<!-- <!--
@BLINK-ALLOW:pageLocation* @BLINK-ALLOW:pageLocation*
@BLINK-ALLOW:pageSize=(560, 460) @BLINK-ALLOW:pageSize=(400, 200)
@BLINK-ALLOW:transform @BLINK-ALLOW:transform
This page includes frame/nested-frame.html in an iframe,
and that page includes frame/box.html in an iframe.
Both pages absolute-position the iframe and give it a scale
factor of 2.0.
The image in box.html is at (10, 10) size (100 x 50)
Relative to nested-frame.html it's at (120, 20) size (200 x 100)
Relative to this file it's at (240, 140) size (400 x 200)
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body style="padding: 0; margin: 0;"> <body style="padding: 0; margin: 0;">
<iframe width=500 height=500 src="/cross-site/2.com/accessibility/html/frame/nested-frame.html" style="border: 0; position: absolute; top: 100px; left: 0px; transform: scale(2.0); transform-origin: left top;"></iframe> <iframe width=500 height=500 src="frame/nested-frame.html" style="border: 0; position: absolute; top: 100px; left: 0px; transform: scale(2.0); transform-origin: left top;"></iframe>
</body> </body>
</html> </html>
<!-- <!--
@WIN-ALLOW:location* @WIN-ALLOW:location*
@WIN-ALLOW:size* @WIN-ALLOW:size=(100, 50)
@WIN-ALLOW:size=(150, 75)
@BLINK-ALLOW:pageLocation* @BLINK-ALLOW:pageLocation*
@BLINK-ALLOW:pageSize=(200, 200) @BLINK-ALLOW:pageSize=(100, 50)
@BLINK-ALLOW:pageSize=(300, 300) @BLINK-ALLOW:pageSize=(150, 75)
@BLINK-ALLOW:transform @BLINK-ALLOW:transform
There are two iframes that each include box.html, one with no transform,
and one with a transform of 1.5 applied.
The image in box.html is at (10, 10) size (100 x 50)
Inside the first iframe it should be at (10, 10) size (100 x 50)
Inside the second iframe it should be at (15, 265) size (150 x 75)
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body style="padding: 0; margin: 0; width: 800px; height: 600px"> <body style="padding: 0; margin: 0;">
<iframe width=220 height=220 src="frame/box.html" style="border: 0; position: absolute; top: 0px; left: 0px;"></iframe> <iframe width=220 height=220 src="frame/box.html" style="border: 0; position: absolute; top: 0px; left: 0px;"></iframe>
<iframe width=220 height=220 src="frame/box.html" style="border: 0; position: absolute; top: 250px; left: 0px; transform: scale(1.5); transform-origin: left top;"></iframe> <iframe width=220 height=220 src="frame/box.html" style="border: 0; position: absolute; top: 250px; left: 0px; transform: scale(1.5); transform-origin: left top;"></iframe>
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment