| commit | aa7f073f10e2976804fe009ef2d2ed182bef9ada | [log] [tgz] |
|---|---|---|
| author | Peter Conn <[email protected]> | Wed Jul 12 12:01:53 2017 |
| committer | Commit Bot <[email protected]> | Wed Jul 12 12:01:53 2017 |
| tree | 3c301bc519bf092629cafa3d030a4aed8039c631 | |
| parent | d831ac043209edc610ec90e845a65cf03ecc8e47 [diff] [blame] |
Revert "📺 Use video aspect ratio to determine PiP params." This reverts commit 164f881f06faea76c87b246e2cdd17ab531416e5. Reason for revert: Caused a failure https://build.chromium.org/p/chromium/builders/Android/builds/74079 Original change's description: > 📺 Use video aspect ratio to determine PiP params. > > Use the bounds of the fullscreen video to determine the starting > bounds for the PiP transformation and the aspect ratio of the PiP > window. > > Change-Id: Ia2227c9d277b5ae2a1dedddb899082e2947137fe > Reviewed-on: https://chromium-review.googlesource.com/536974 > Commit-Queue: Peter Conn <[email protected]> > Reviewed-by: Jochen Eisinger <[email protected]> > Reviewed-by: Mounir Lamouri <[email protected]> > Reviewed-by: Bernhard Bauer <[email protected]> > Cr-Commit-Position: refs/heads/master@{#485916} [email protected],[email protected],[email protected],[email protected] Change-Id: I91b3e716c02bd5c41cf93d3fde04e0874d26d3e6 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/566865 Reviewed-by: Peter Conn <[email protected]> Commit-Queue: Peter Conn <[email protected]> Cr-Commit-Position: refs/heads/master@{#485929}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index e0b68ae..b85d291 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5717,12 +5717,9 @@ observer.MediaResized(size, id); } -base::Optional<gfx::Size> WebContentsImpl::GetFullscreenVideoSize() { - base::Optional<WebContentsObserver::MediaPlayerId> id = - media_web_contents_observer_->GetFullscreenVideoMediaPlayerId(); - if (id && cached_video_sizes_.count(id.value())) - return base::Optional<gfx::Size>(cached_video_sizes_[id.value()]); - return base::Optional<gfx::Size>(); +const WebContents::VideoSizeMap& +WebContentsImpl::GetCurrentlyPlayingVideoSizes() { + return cached_video_sizes_; } int WebContentsImpl::GetCurrentlyPlayingVideoCount() {