Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 3157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3168 m_playbackProgressTimer.stop(); | 3168 m_playbackProgressTimer.stop(); |
| 3169 m_playing = false; | 3169 m_playing = false; |
| 3170 double time = currentTime(); | 3170 double time = currentTime(); |
| 3171 if (time > m_lastSeekTime) | 3171 if (time > m_lastSeekTime) |
| 3172 addPlayedRange(m_lastSeekTime, time); | 3172 addPlayedRange(m_lastSeekTime, time); |
| 3173 | 3173 |
| 3174 if (mediaControls()) | 3174 if (mediaControls()) |
| 3175 mediaControls()->playbackStopped(); | 3175 mediaControls()->playbackStopped(); |
| 3176 } | 3176 } |
| 3177 | 3177 |
| 3178 if (webMediaPlayer()) { | |
| 3179 // Always notify of playback state changes; this information is used by | |
| 3180 // the WebMediaPlayer to optimize resource consumption. | |
| 3181 webMediaPlayer()->setPlaybackState(m_playing || !m_paused ? WebMediaPlay er::PlaybackState::Playing : WebMediaPlayer::PlaybackState::Paused); | |
|
sandersd (OOO until July 31)
2016/08/30 18:40:18
This way of sending the information somewhat impli
DaleCurtis
2016/08/30 21:56:04
Added set during startPlayerLoad() -- otherwise I
| |
| 3182 } | |
| 3183 | |
| 3178 if (layoutObject()) | 3184 if (layoutObject()) |
| 3179 layoutObject()->updateFromElement(); | 3185 layoutObject()->updateFromElement(); |
| 3180 } | 3186 } |
| 3181 | 3187 |
| 3182 void HTMLMediaElement::stopPeriodicTimers() | 3188 void HTMLMediaElement::stopPeriodicTimers() |
| 3183 { | 3189 { |
| 3184 m_progressEventTimer.stop(); | 3190 m_progressEventTimer.stop(); |
| 3185 m_playbackProgressTimer.stop(); | 3191 m_playbackProgressTimer.stop(); |
| 3186 } | 3192 } |
| 3187 | 3193 |
| (...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4027 | 4033 |
| 4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst | 4034 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst |
| 4029 { | 4035 { |
| 4030 IntRect result; | 4036 IntRect result; |
| 4031 if (LayoutObject* object = m_element->layoutObject()) | 4037 if (LayoutObject* object = m_element->layoutObject()) |
| 4032 result = object->absoluteBoundingBoxRect(); | 4038 result = object->absoluteBoundingBoxRect(); |
| 4033 return result; | 4039 return result; |
| 4034 } | 4040 } |
| 4035 | 4041 |
| 4036 } // namespace blink | 4042 } // namespace blink |
| OLD | NEW |