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 "base/strings/string_number_conversions.h"
@@ skipping 76 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 267 matching lines @@
       break;
   }
   client_->repaint();
 }
 
 void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) {
   has_size_info_ = true;
   if (natural_size_.width == width && natural_size_.height == height)
     return;
 
+#if defined(GOOGLE_TV)
   static bool has_switch = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseExternalVideoSurfaceThresholdInPixels);
   static int threshold = 0;
   static bool parsed_arg =
       has_switch &&
       base::StringToInt(
           CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
               switches::kUseExternalVideoSurfaceThresholdInPixels),
           &threshold);
 
   if (parsed_arg && threshold <= width * height) {
     needs_external_surface_ = true;
     SetNeedsEstablishPeer(false);
     if (!paused())
       RequestExternalSurface();
   }
+#endif
 
   natural_size_.width = width;
   natural_size_.height = height;
   ReallocateVideoFrame();
 }
 
 void WebMediaPlayerAndroid::UpdateNetworkState(
     WebMediaPlayer::NetworkState state) {
   network_state_ = state;
   client_->networkStateChanged();
@@ skipping 104 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::RetrieveGeometryChange(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());
+  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