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

Side by Side Diff: content/renderer/media/android/renderer_media_player_manager.cc

Issue 110683002: Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/media/android/renderer_media_player_manager.h" 5 #include "content/renderer/media/android/renderer_media_player_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/common/media/media_player_messages_android.h" 9 #include "content/common/media/media_player_messages_android.h"
10 #include "content/renderer/media/android/proxy_media_keys.h" 10 #include "content/renderer/media/android/proxy_media_keys.h"
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 } 383 }
384 384
385 void RendererMediaPlayerManager::DidExitFullscreen() { 385 void RendererMediaPlayerManager::DidExitFullscreen() {
386 fullscreen_frame_ = NULL; 386 fullscreen_frame_ = NULL;
387 } 387 }
388 388
389 bool RendererMediaPlayerManager::IsInFullscreen(blink::WebFrame* frame) { 389 bool RendererMediaPlayerManager::IsInFullscreen(blink::WebFrame* frame) {
390 return fullscreen_frame_ == frame; 390 return fullscreen_frame_ == frame;
391 } 391 }
392 392
393 #if defined(GOOGLE_TV) 393 #if defined(VIDEO_HOLE)
394 void RendererMediaPlayerManager::RequestExternalSurface( 394 void RendererMediaPlayerManager::RequestExternalSurface(
395 int player_id, 395 int player_id,
396 const gfx::RectF& geometry) { 396 const gfx::RectF& geometry) {
397 Send(new MediaPlayerHostMsg_NotifyExternalSurface( 397 Send(new MediaPlayerHostMsg_NotifyExternalSurface(
398 routing_id(), player_id, true, geometry)); 398 routing_id(), player_id, true, geometry));
399 } 399 }
400 400
401 void RendererMediaPlayerManager::DidCommitCompositorFrame() { 401 void RendererMediaPlayerManager::DidCommitCompositorFrame() {
402 std::map<int, gfx::RectF> geometry_change; 402 std::map<int, gfx::RectF> geometry_change;
403 RetrieveGeometryChanges(&geometry_change); 403 RetrieveGeometryChanges(&geometry_change);
(...skipping 15 matching lines...) Expand all
419 WebMediaPlayerAndroid* player = player_it->second; 419 WebMediaPlayerAndroid* player = player_it->second;
420 420
421 if (player && player->hasVideo()) { 421 if (player && player->hasVideo()) {
422 gfx::RectF rect; 422 gfx::RectF rect;
423 if (player->RetrieveGeometryChange(&rect)) { 423 if (player->RetrieveGeometryChange(&rect)) {
424 (*changes)[player_it->first] = rect; 424 (*changes)[player_it->first] = rect;
425 } 425 }
426 } 426 }
427 } 427 }
428 } 428 }
429 #endif 429 #endif // defined(VIDEO_HOLE)
430 430
431 } // namespace content 431 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698