Title: [187876] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 187876
- Author
- matthew_han...@apple.com
- Date
- 2015-08-04 12:22:52 -0700 (Tue, 04 Aug 2015)
Log Message
Merge r187762. rdar://problem/22026864
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (187875 => 187876)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-04 19:11:46 UTC (rev 187875)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-04 19:22:52 UTC (rev 187876)
@@ -1,3 +1,29 @@
+2015-08-04 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r187762. rdar://problem/22026864
+
+ 2015-08-03 Dean Jackson <d...@apple.com>
+
+ Inline video controls overlap each other while playing video in slideover mode
+ https://bugs.webkit.org/show_bug.cgi?id=147535
+ <rdar://problem/22026864>
+
+ Reviewed by Eric Carlson.
+
+ Now that the resizing code is in the shared controller, we need to
+ make sure to hide the timeline scrubber in iOS when the controls
+ get too small. This involved adding the dropped class to the timeline,
+ and rules for hiding to the CSS.
+
+ Meanwhile, when the page scale factor is less than one, we use the CSS zoom property
+ and don't need to factor in the page scale factor when calculating
+ the size.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.updateLayoutForDisplayedWidth): Don't use pageScaleFactor.
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (audio::-webkit-media-controls-panel .dropped): Add display none for this rule.
+
2015-08-03 Matthew Hanson <matthew_han...@apple.com>
Merge r187740. rdar://problem/22098457
Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (187875 => 187876)
--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-04 19:11:46 UTC (rev 187875)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-04 19:22:52 UTC (rev 187876)
@@ -1453,7 +1453,10 @@
if (!this.controls || !this.controls.panel)
return;
- var visibleWidth = this.controls.panel.getBoundingClientRect().width * this._pageScaleFactor;
+ var visibleWidth = this.controls.panel.getBoundingClientRect().width;
+ if (this._pageScaleFactor > 1)
+ visibleWidth *= this._pageScaleFactor;
+
if (visibleWidth <= 0 || visibleWidth == this.currentDisplayWidth)
return;
@@ -1470,6 +1473,7 @@
// Check if there is enough room for the scrubber.
var shouldDropTimeline = (visibleWidth - visibleButtonWidth) < this.MinimumTimelineWidth;
+ this.controls.timeline.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
this.controls.currentTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
this.controls.thumbnailTrack.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
this.controls.remainingTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (187875 => 187876)
--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-08-04 19:11:46 UTC (rev 187875)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-08-04 19:22:52 UTC (rev 187876)
@@ -153,7 +153,9 @@
}
video::-webkit-media-controls-panel .hidden,
-audio::-webkit-media-controls-panel .hidden {
+audio::-webkit-media-controls-panel .hidden,
+video::-webkit-media-controls-panel .dropped,
+audio::-webkit-media-controls-panel .dropped {
display: none;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
