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 2831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2842 | 2842 |
2843 if (m_player->paused()) | 2843 if (m_player->paused()) |
2844 pause(); | 2844 pause(); |
2845 else | 2845 else |
2846 playInternal(); | 2846 playInternal(); |
2847 } | 2847 } |
2848 | 2848 |
2849 void HTMLMediaElement::mediaPlayerRequestFullscreen() | 2849 void HTMLMediaElement::mediaPlayerRequestFullscreen() |
2850 { | 2850 { |
2851 WTF_LOG(Media, "HTMLMediaElement::mediaPlayerRequestFullscreen"); | 2851 WTF_LOG(Media, "HTMLMediaElement::mediaPlayerRequestFullscreen"); |
2852 | |
2853 // The player is responsible for only invoking this callback in response to | |
2854 // user interaction or when it is technically required to play the video. | |
2855 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); | |
qinmin
2014/03/24 06:32:54
will the gesture be consumed by FullscreenElementS
philipj_slow
2014/03/24 15:18:23
The UserGestureIndicator is only active while it's
acolwell GONE FROM CHROMIUM
2014/03/25 22:14:43
How about we just move the settings code from Full
philipj_slow
2014/03/26 07:48:17
Sorry, I didn't communicate my intentions very cle
acolwell GONE FROM CHROMIUM
2014/03/26 17:39:43
Ok. Given the other 2 CLs, I'm fine with doing def
| |
2856 | |
2852 enterFullscreen(); | 2857 enterFullscreen(); |
2853 } | 2858 } |
2854 | 2859 |
2855 void HTMLMediaElement::mediaPlayerRequestSeek(double time) | 2860 void HTMLMediaElement::mediaPlayerRequestSeek(double time) |
2856 { | 2861 { |
2857 // The player is the source of this seek request. | 2862 // The player is the source of this seek request. |
2858 if (m_mediaController) { | 2863 if (m_mediaController) { |
2859 m_mediaController->setCurrentTime(time, IGNORE_EXCEPTION); | 2864 m_mediaController->setCurrentTime(time, IGNORE_EXCEPTION); |
2860 return; | 2865 return; |
2861 } | 2866 } |
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3659 { | 3664 { |
3660 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); | 3665 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); |
3661 } | 3666 } |
3662 | 3667 |
3663 bool HTMLMediaElement::isInteractiveContent() const | 3668 bool HTMLMediaElement::isInteractiveContent() const |
3664 { | 3669 { |
3665 return fastHasAttribute(controlsAttr); | 3670 return fastHasAttribute(controlsAttr); |
3666 } | 3671 } |
3667 | 3672 |
3668 } | 3673 } |
OLD | NEW |