Title: [185258] trunk
- Revision
- 185258
- Author
- eric.carl...@apple.com
- Date
- 2015-06-05 11:39:08 -0700 (Fri, 05 Jun 2015)
Log Message
Layout tests fullscreen/video-controls-drag.html and media/video-fullscreeen-only-controls.html
fail on WK1 and WK2
https://bugs.webkit.org/show_bug.cgi?id=145675
Reviewed by Dean Jackson.
Source/WebCore:
No new tests, changes covered by existing tests.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.updateControls): Use shouldHaveControls() to test if controls should
be visible.
(Controller.prototype.handleWrapperMouseMove): Don't return early when in fullscreen.
(Controller.prototype.updateFullscreenButtons): Drive-by fix: always show the (exit) fullscreen
button when in fullscreen.
LayoutTests:
* TestExpectations: Unskip tests.
* fullscreen/video-controls-drag.html: Minor cleanup, force layout before testing control location.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (185257 => 185258)
--- trunk/LayoutTests/ChangeLog 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/LayoutTests/ChangeLog 2015-06-05 18:39:08 UTC (rev 185258)
@@ -1,3 +1,14 @@
+2015-06-05 Eric Carlson <eric.carl...@apple.com>
+
+ Layout tests fullscreen/video-controls-drag.html and media/video-fullscreeen-only-controls.html
+ fail on WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=145675
+
+ Reviewed by Dean Jackson.
+
+ * TestExpectations: Unskip tests.
+ * fullscreen/video-controls-drag.html: Minor cleanup, force layout before testing control location.
+
2015-06-05 Zalan Bujtas <za...@apple.com>
[iOS] Rebaseline expected results.
Modified: trunk/LayoutTests/TestExpectations (185257 => 185258)
--- trunk/LayoutTests/TestExpectations 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/LayoutTests/TestExpectations 2015-06-05 18:39:08 UTC (rev 185258)
@@ -525,6 +525,3 @@
webkit.org/b/145007 js/regress-141098.html [ Skip ]
webkit.org/b/145390 storage/indexeddb/deleteIndex-bug110792.html [ Pass Failure ]
-
-webkit.org/b/145675 fullscreen/video-controls-drag.html [ Skip ]
-webkit.org/b/145675 media/video-fullscreeen-only-controls.html [ Skip ]
Modified: trunk/LayoutTests/fullscreen/video-controls-drag.html (185257 => 185258)
--- trunk/LayoutTests/fullscreen/video-controls-drag.html 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/LayoutTests/fullscreen/video-controls-drag.html 2015-06-05 18:39:08 UTC (rev 185258)
@@ -5,18 +5,17 @@
<script src=""
<script>
var video = document.getElementById('video');
- var shadowRoot;
var panel;
var startBox;
var endBox;
- var fullscreenChanged = function(event)
- {
- if (callback)
- callback(event)
- };
waitForEvent(document, 'webkitfullscreenchange', function() {
if (window.internals) {
+
+ // Force a relayout to ensure that the controls in the shadow DOM have been
+ // positioned correctly.
+ document.body.offsetTop;
+
panel = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-panel');
startBox = internals.boundingBox(panel);
Modified: trunk/Source/WebCore/ChangeLog (185257 => 185258)
--- trunk/Source/WebCore/ChangeLog 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/Source/WebCore/ChangeLog 2015-06-05 18:39:08 UTC (rev 185258)
@@ -1,3 +1,21 @@
+2015-06-05 Eric Carlson <eric.carl...@apple.com>
+
+ Layout tests fullscreen/video-controls-drag.html and media/video-fullscreeen-only-controls.html
+ fail on WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=145675
+
+ Reviewed by Dean Jackson.
+
+ No new tests, changes covered by existing tests.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.updateControls): Use shouldHaveControls() to test if controls should
+ be visible.
+ (Controller.prototype.handleWrapperMouseMove): Don't return early when in fullscreen.
+ (Controller.prototype.updateFullscreenButtons): Drive-by fix: always show the (exit) fullscreen
+ button when in fullscreen.
+
+
2015-06-04 David Hyatt <hy...@apple.com>
Underlines too close in vertical Chinese text.
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (185257 => 185258)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-06-05 18:39:08 UTC (rev 185258)
@@ -612,7 +612,7 @@
this.updateLayoutForDisplayedWidth();
this.setNeedsTimelineMetricsUpdate();
- if (this.video.controls || this.isFullScreen()) {
+ if (this.shouldHaveControls()) {
this.controls.panel.classList.add(this.ClassNames.show);
this.controls.panel.classList.remove(this.ClassNames.hidden);
this.resetHideControlsTimer();
@@ -788,7 +788,7 @@
handleWrapperMouseMove: function(event)
{
- if (!this.video.controls)
+ if (!this.video.controls && !this.isFullScreen())
return;
if (this.controlsAreHidden())
@@ -1024,7 +1024,7 @@
updateFullscreenButtons: function()
{
var shouldBeHidden = !this.video.webkitSupportsFullscreen || !this.hasVideo();
- this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
+ this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden && !this.isFullScreen());
this.controls.optimizedFullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
this.setNeedsUpdateForDisplayedWidth();
this.updateLayoutForDisplayedWidth();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
