Changeset 215951 in webkit

Timestamp:

Apr 28, 2017 3:33:28 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

ARGUMENT BAD: time, time >= 0
​https://bugs.webkit.org/show_bug.cgi?id=164336
rdar://problem/29314891

Patch by Jeremy Jones <​jeremyj@apple.com> on 2017-04-28
Reviewed by Eric Carlson.

Source/WebCore:

Handle invalid duration and current time when calculating remaining time.

Test media/modern-media-controls/pip-support/pip-support-click.html now works without a workaround
in media/modern-media-controls/pip-support/pip-support-enabled.html

• platform/mac/WebVideoFullscreenHUDWindowController.mm:

(-[WebVideoFullscreenHUDWindowController remainingTimeText]):

LayoutTests:

Remove workaround that affected other tests.

• media/modern-media-controls/pip-support/pip-support-click.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-28  Jeremy Jones  <jeremyj@apple.com>
+
+        ARGUMENT BAD: time, time >= 0
+        https://bugs.webkit.org/show_bug.cgi?id=164336
+        rdar://problem/29314891
+
+        Reviewed by Eric Carlson.
+
+        Remove workaround that affected other tests.
+
+        * media/modern-media-controls/pip-support/pip-support-click.html:
+
 2017-04-28  Chris Dumez  <cdumez@apple.com>
 

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

@@ -32 +32 @@
     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/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-28  Jeremy Jones  <jeremyj@apple.com>
+
+        ARGUMENT BAD: time, time >= 0
+        https://bugs.webkit.org/show_bug.cgi?id=164336
+        rdar://problem/29314891
+
+        Reviewed by Eric Carlson.
+
+        Handle invalid duration and current time when calculating remaining time.
+
+        Test media/modern-media-controls/pip-support/pip-support-click.html now works without a workaround
+        in media/modern-media-controls/pip-support/pip-support-enabled.html
+
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        (-[WebVideoFullscreenHUDWindowController remainingTimeText]):
+
 2017-04-28  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm

@@ -560 +560 @@
         return @"";
 
-    return [@"-" stringByAppendingString:timeToString(videoElement->duration() - videoElement->currentTime())];
+    double remainingTime = 0;
+
+    if (std::isfinite(videoElement->duration()) && std::isfinite(videoElement->currentTime()))
+        remainingTime = videoElement->duration() - videoElement->currentTime();
+
+    return [@"-" stringByAppendingString:timeToString(remainingTime)];
 }