Title: [211130] trunk/LayoutTests
Revision
211130
Author
[email protected]
Date
2017-01-24 18:56:40 -0800 (Tue, 24 Jan 2017)

Log Message

Work around a crash when running media/modern-media-controls/pip-support/pip-support-enabled.html
https://bugs.webkit.org/show_bug.cgi?id=167381

Patch by Antoine Quint <[email protected]> on 2017-01-24
Reviewed by Dean Jackson.

The test at media/modern-media-controls/pip-support/pip-support-enabled.html would crash because the test that
preceded it, media/modern-media-controls/pip-support/pip-support-click.html, would not exit the PiP presentation mode
before exiting the test. We now exit PiP before proceeding to the next test which avoid hitting the assertion
and the crash in Debug builds.

* media/modern-media-controls/pip-support/pip-support-click.html:
* platform/mac-wk1/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (211129 => 211130)


--- trunk/LayoutTests/ChangeLog	2017-01-25 02:52:51 UTC (rev 211129)
+++ trunk/LayoutTests/ChangeLog	2017-01-25 02:56:40 UTC (rev 211130)
@@ -1,3 +1,18 @@
+2017-01-24  Antoine Quint  <[email protected]>
+
+        Work around a crash when running media/modern-media-controls/pip-support/pip-support-enabled.html
+        https://bugs.webkit.org/show_bug.cgi?id=167381
+
+        Reviewed by Dean Jackson.
+
+        The test at media/modern-media-controls/pip-support/pip-support-enabled.html would crash because the test that
+        preceded it, media/modern-media-controls/pip-support/pip-support-click.html, would not exit the PiP presentation mode
+        before exiting the test. We now exit PiP before proceeding to the next test which avoid hitting the assertion
+        and the crash in Debug builds.
+
+        * media/modern-media-controls/pip-support/pip-support-click.html:
+        * platform/mac-wk1/TestExpectations:
+
 2017-01-24  Brent Fulgham  <[email protected]>
 
         Bug 167392: REGRESSION(r210531): Relax same-volume display requirement for iOS

Modified: trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html (211129 => 211130)


--- trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html	2017-01-25 02:52:51 UTC (rev 211129)
+++ trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html	2017-01-25 02:56:40 UTC (rev 211130)
@@ -24,8 +24,6 @@
 
 description("Testing the <code>PiPSupport</code> behavior when clicking the PiP button.");
 
-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
 if (window.internals)
     window.internals.settings.setAllowsPictureInPictureMediaPlayback(true);
 
@@ -48,6 +46,11 @@
 
 media.addEventListener("webkitpresentationmodechanged", () => {
     shouldBeEqualToString("media.webkitPresentationMode", "picture-in-picture");
+
+    // FIXME: We exit PiP so we leave things in a clean state, otherwise the following
+    // test pip-support-enabled.html may crash, see webkit.org/b/164336.
+    media.webkitSetPresentationMode("inline");
+
     container.remove();
     media.remove();
     finishMediaControlsTest();

Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (211129 => 211130)


--- trunk/LayoutTests/platform/mac-wk1/TestExpectations	2017-01-25 02:52:51 UTC (rev 211129)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations	2017-01-25 02:56:40 UTC (rev 211130)
@@ -301,8 +301,6 @@
 
 webkit.org/b/167253 media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html [ Pass Failure ]
 
-webkit.org/b/164336 [ Sierra Debug ] media/modern-media-controls/pip-support/pip-support-enabled.html [ Crash ]
-
 webkit.org/b/167320 [ Sierra Release ] media/modern-media-controls/placard-support/placard-support-pip.html [ Pass Crash ]
 
 webkit.org/b/167352 [ ElCapitan Debug ] media/modern-media-controls/rewind-button/rewind-button.html [ Pass Timeout ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to