Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214183 => 214184)
--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 18:51:49 UTC (rev 214183)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 18:51:52 UTC (rev 214184)
@@ -1,5 +1,16 @@
2017-03-20 Jason Marcell <jmarc...@apple.com>
+ Merge r214094.
+
+ 2017-03-16 Ryan Haddad <ryanhad...@apple.com>
+
+ Add baseline for fast/canvas/webgl/context-creation-attributes.html.
+ Unreviewed test gardening.
+
+ * platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt: Added.
+
+2017-03-20 Jason Marcell <jmarc...@apple.com>
+
Merge r214081.
2017-03-16 Ryan Haddad <ryanhad...@apple.com>
Added: branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt (0 => 214184)
--- branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk1/fast/canvas/webgl/context-creation-attributes-expected.txt 2017-03-20 18:51:52 UTC (rev 214184)
@@ -0,0 +1,6 @@
+Note that some of the values tested here might not be supported, and thus should return the default values.
+
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":false,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":false}
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":false,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":true}
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":false,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":false}
+{"alpha":true,"antialias":true,"depth":true,"failIfMajorPerformanceCaveat":true,"powerPreference":"low-power","premultipliedAlpha":true,"preserveDrawingBuffer":false,"stencil":false}
