Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.cpp

Issue 22454003: Support subtitles for native fullscreen video (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: enabling layout tests Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "WebMediaPlayerClientImpl.h" 6 #include "WebMediaPlayerClientImpl.h"
7 7
8 #include "InbandTextTrackPrivateImpl.h" 8 #include "InbandTextTrackPrivateImpl.h"
9 #include "MediaSourcePrivateImpl.h" 9 #include "MediaSourcePrivateImpl.h"
10 #include "WebAudioSourceProvider.h" 10 #include "WebAudioSourceProvider.h"
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 if (m_webMediaPlayer) 303 if (m_webMediaPlayer)
304 m_webMediaPlayer->play(); 304 m_webMediaPlayer->play();
305 } 305 }
306 306
307 void WebMediaPlayerClientImpl::pause() 307 void WebMediaPlayerClientImpl::pause()
308 { 308 {
309 if (m_webMediaPlayer) 309 if (m_webMediaPlayer)
310 m_webMediaPlayer->pause(); 310 m_webMediaPlayer->pause();
311 } 311 }
312 312
313 #if USE(NATIVE_FULLSCREEN_VIDEO) 313 void WebMediaPlayerClientImpl::showFullscreenOverlay()
314 void WebMediaPlayerClientImpl::enterFullscreen()
315 { 314 {
316 if (m_webMediaPlayer) 315 if (m_webMediaPlayer)
317 m_webMediaPlayer->enterFullscreen(); 316 m_webMediaPlayer->enterFullscreen();
318 } 317 }
319 318
320 void WebMediaPlayerClientImpl::exitFullscreen() 319 void WebMediaPlayerClientImpl::hideFullscreenOverlay()
321 { 320 {
322 if (m_webMediaPlayer) 321 if (m_webMediaPlayer)
323 m_webMediaPlayer->exitFullscreen(); 322 m_webMediaPlayer->exitFullscreen();
324 } 323 }
325 324
326 bool WebMediaPlayerClientImpl::canEnterFullscreen() const 325 bool WebMediaPlayerClientImpl::canShowFullscreenOverlay() const
327 { 326 {
328 return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen(); 327 return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen();
329 } 328 }
330 #endif
331 329
332 MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::generateKeyRequest(cons t String& keySystem, const unsigned char* initData, unsigned initDataLength) 330 MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::generateKeyRequest(cons t String& keySystem, const unsigned char* initData, unsigned initDataLength)
333 { 331 {
334 if (!m_webMediaPlayer) 332 if (!m_webMediaPlayer)
335 return MediaPlayer::InvalidPlayerState; 333 return MediaPlayer::InvalidPlayerState;
336 334
337 WebMediaPlayer::MediaKeyException result = m_webMediaPlayer->generateKeyRequ est(keySystem, initData, initDataLength); 335 WebMediaPlayer::MediaKeyException result = m_webMediaPlayer->generateKeyRequ est(keySystem, initData, initDataLength);
338 return static_cast<MediaPlayer::MediaKeyException>(result); 336 return static_cast<MediaPlayer::MediaKeyException>(result);
339 } 337 }
340 338
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 751
754 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel s, float sampleRate) 752 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel s, float sampleRate)
755 { 753 {
756 if (m_client) 754 if (m_client)
757 m_client->setFormat(numberOfChannels, sampleRate); 755 m_client->setFormat(numberOfChannels, sampleRate);
758 } 756 }
759 757
760 #endif 758 #endif
761 759
762 } // namespace WebKit 760 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698