Location/size change notification when external rendering is enabled

webkit/media/android/webmediaplayer_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/android/webmediaplayer_android.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "cc/layers/video_layer.h"
@@ skipping 36 matching lines @@
       has_size_info_(false),
       stream_texture_factory_(factory),
       needs_external_surface_(false),
       video_frame_provider_client_(NULL) {
   main_loop_->AddDestructionObserver(this);
   if (manager_)
     player_id_ = manager_->RegisterMediaPlayer(this);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseExternalVideoSurface)) {
+#if defined(GOOGLE_TV)
     needs_external_surface_ = true;
     SetNeedsEstablishPeer(false);
     ReallocateVideoFrame();
+#else
+    NOTIMPLEMENTED() << "No external video surface rendering support";
+#endif
   } else if (stream_texture_factory_.get()) {
     stream_texture_proxy_.reset(stream_texture_factory_->CreateProxy());
     stream_id_ = stream_texture_factory_->CreateStreamTexture(&texture_id_);
     ReallocateVideoFrame();
   }
 }
 
 WebMediaPlayerAndroid::~WebMediaPlayerAndroid() {
   SetVideoFrameProviderClient(NULL);
   client_->setWebLayer(NULL);
@@ skipping 21 matching lines @@
                                  WebMediaSource* media_source,
                                  CORSMode cors_mode) {
   NOTIMPLEMENTED();
 }
 
 void WebMediaPlayerAndroid::cancelLoad() {
   NOTIMPLEMENTED();
 }
 
 void WebMediaPlayerAndroid::play() {
+#if defined(GOOGLE_TV)
   if (hasVideo() && needs_external_surface_) {
     DCHECK(!needs_establish_peer_);
     RequestExternalSurface();
   }
+#endif
   if (hasVideo() && needs_establish_peer_)
     EstablishSurfaceTexturePeer();
 
   PlayInternal();
   is_playing_ = true;
 }
 
 void WebMediaPlayerAndroid::pause() {
   PauseInternal();
   is_playing_ = false;
@@ skipping 390 matching lines @@
 }
 
 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) {
   needs_establish_peer_ = needs_establish_peer;
 }
 
 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
   is_playing_ = is_playing;
 }
 
+#if defined(GOOGLE_TV)
+bool WebMediaPlayerAndroid::GetGeometryChange(gfx::RectF* rect) {
+  if (!video_weblayer_)
+    return false;
+
+  // Compute the geometry of video frame layer.
+  cc::Layer* layer = video_weblayer_->layer();
+  rect->set_size(layer->bounds());

[palmer, 2013/04/12 18:51:21]

Maybe this function should be called |SetGeometryChange|, since it updates its
argument rather than retrieving a field value.

[wonsik, 2013/04/15 02:44:16]

Good point. I will use |RetrieveGeometryChange| to clearly distinguish it from
getter/setter patterns. 

+  while (layer) {
+    rect->Offset(layer->position().OffsetFromOrigin());
+    layer = layer->parent();
+  }
+
+  // Return false when the geometry hasn't been changed from the last time.
+  if (last_computed_rect_ == *rect)
+    return false;
+
+  // Store the changed geometry information when it is actually changed.
+  last_computed_rect_ = *rect;
+  return true;
+}
+#endif
+
 }  // namespace webkit_media