Changeset 211130 in webkit

Timestamp:

Jan 24, 2017 6:56:40 PM (7 years ago)

Author:

commit-queue@webkit.org

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 <Antoine Quint> 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:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/modern-media-controls/pip-support/pip-support-click.html (modified) (2 diffs)
• platform/mac-wk1/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-01-24  Antoine Quint  <graouts@apple.com>
+
+        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  <bfulgham@apple.com>
 

trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html

@@ -25 +25 @@
 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);
@@ -49 +47 @@
 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();

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -302 +302 @@
 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 ]