OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights |
3 * reserved. | 3 * reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 3669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3680 return; | 3680 return; |
3681 } | 3681 } |
3682 | 3682 |
3683 EnsureMediaControls(); | 3683 EnsureMediaControls(); |
3684 // TODO(mlamouri): this doesn't sound needed but the following tests, on | 3684 // TODO(mlamouri): this doesn't sound needed but the following tests, on |
3685 // Android fails when removed: | 3685 // Android fails when removed: |
3686 // fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html | 3686 // fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html |
3687 GetMediaControls()->Reset(); | 3687 GetMediaControls()->Reset(); |
3688 | 3688 |
3689 if (ShouldShowControls(RecordMetricsBehavior::kDoRecord)) | 3689 if (ShouldShowControls(RecordMetricsBehavior::kDoRecord)) |
3690 GetMediaControls()->Show(); | 3690 GetMediaControls()->MaybeShow(); |
3691 else | 3691 else |
3692 GetMediaControls()->Hide(); | 3692 GetMediaControls()->Hide(); |
3693 } | 3693 } |
3694 | 3694 |
3695 CueTimeline& HTMLMediaElement::GetCueTimeline() { | 3695 CueTimeline& HTMLMediaElement::GetCueTimeline() { |
3696 if (!cue_timeline_) | 3696 if (!cue_timeline_) |
3697 cue_timeline_ = new CueTimeline(*this); | 3697 cue_timeline_ = new CueTimeline(*this); |
3698 return *cue_timeline_; | 3698 return *cue_timeline_; |
3699 } | 3699 } |
3700 | 3700 |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4081 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); | 4081 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); |
4082 } | 4082 } |
4083 | 4083 |
4084 void HTMLMediaElement::ViewportFillDebouncerTimerFired(TimerBase*) { | 4084 void HTMLMediaElement::ViewportFillDebouncerTimerFired(TimerBase*) { |
4085 mostly_filling_viewport_ = true; | 4085 mostly_filling_viewport_ = true; |
4086 if (web_media_player_) | 4086 if (web_media_player_) |
4087 web_media_player_->BecameDominantVisibleContent(mostly_filling_viewport_); | 4087 web_media_player_->BecameDominantVisibleContent(mostly_filling_viewport_); |
4088 } | 4088 } |
4089 | 4089 |
4090 } // namespace blink | 4090 } // namespace blink |
OLD | NEW |