[aw] Reuse WebContents PowerSaveBlocker in fullscreen.

content/browser/android/content_video_view.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 "content/browser/android/content_video_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 35 matching lines @@
   return g_content_video_view;
 }
 
 ContentVideoView::ContentVideoView(
     BrowserMediaPlayerManager* manager)
     : manager_(manager),
       weak_factory_(this) {
   DCHECK(!g_content_video_view);
   j_content_video_view_ = CreateJavaObject();
   g_content_video_view = this;
-  CreatePowerSaveBlocker();
 }
 
 ContentVideoView::~ContentVideoView() {
   DCHECK(g_content_video_view);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_destroyContentVideoView(env,
         content_video_view.obj(), true);
     j_content_video_view_.reset();
   }
   g_content_video_view = NULL;
 }
 
 void ContentVideoView::OpenVideo() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
-    CreatePowerSaveBlocker();
     Java_ContentVideoView_openVideo(env, content_video_view.obj());
   }
 }
 
 void ContentVideoView::OnMediaPlayerError(int error_type) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
-    power_save_blocker_.reset();
     Java_ContentVideoView_onMediaPlayerError(env, content_video_view.obj(),
         error_type);
   }
 }
 
 void ContentVideoView::OnVideoSizeChanged(int width, int height) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_onVideoSizeChanged(env, content_video_view.obj(),
         width, height);
   }
 }
 
 void ContentVideoView::OnBufferingUpdate(int percent) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_onBufferingUpdate(env, content_video_view.obj(),
         percent);
   }
 }
 
 void ContentVideoView::OnPlaybackComplete() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
-    power_save_blocker_.reset();
     Java_ContentVideoView_onPlaybackComplete(env, content_video_view.obj());
   }
 }
 
 void ContentVideoView::OnExitFullscreen() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null())
     Java_ContentVideoView_onExitFullscreen(env, content_video_view.obj());
 }
@@ skipping 71 matching lines @@
 bool ContentVideoView::IsPlaying(JNIEnv*, jobject obj) {
   media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer();
   return player ? player->IsPlaying() : false;
 }
 
 void ContentVideoView::SeekTo(JNIEnv*, jobject obj, jint msec) {
   manager_->FullscreenPlayerSeek(msec);
 }
 
 void ContentVideoView::Play(JNIEnv*, jobject obj) {
-  CreatePowerSaveBlocker();
   manager_->FullscreenPlayerPlay();
 }
 
 void ContentVideoView::Pause(JNIEnv*, jobject obj) {
-  power_save_blocker_.reset();
   manager_->FullscreenPlayerPause();
 }
 
 void ContentVideoView::ExitFullscreen(
     JNIEnv*, jobject, jboolean release_media_player) {
-  power_save_blocker_.reset();
   j_content_video_view_.reset();
   manager_->ExitFullscreen(release_media_player);
 }
 
 void ContentVideoView::SetSurface(JNIEnv* env, jobject obj,
                                   jobject surface) {
   manager_->SetVideoSurface(
       gfx::ScopedJavaSurface::AcquireExternalSurface(surface));
 }
 
 void ContentVideoView::RequestMediaMetadata(JNIEnv* env, jobject obj) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ContentVideoView::UpdateMediaMetadata,
                  weak_factory_.GetWeakPtr()));
 }
 
 ScopedJavaLocalRef<jobject> ContentVideoView::GetJavaObject(JNIEnv* env) {
   return j_content_video_view_.get(env);
 }
 
-gfx::NativeView ContentVideoView::GetNativeView() {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
-  if (content_video_view.is_null())
-    return NULL;
-
-  return reinterpret_cast<gfx::NativeView>(
-      Java_ContentVideoView_getNativeViewAndroid(env,
-                                                 content_video_view.obj()));
-
-}
-
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject() {
   ContentViewCoreImpl* content_view_core = manager_->GetContentViewCore();
   JNIEnv* env = AttachCurrentThread();
   return JavaObjectWeakGlobalRef(
       env,
       Java_ContentVideoView_createContentVideoView(
           env,
           content_view_core->GetJavaObject().obj(),
           reinterpret_cast<intptr_t>(this)).obj());
 }
-
-void ContentVideoView::CreatePowerSaveBlocker() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableContentVideoViewPowerSaveBlocker)) {
-    // In fullscreen Clank reuses the power save blocker attached to the
-    // container view that was created for embedded video. The WebView cannot
-    // reuse that so we create a new blocker instead.
-    if (power_save_blocker_) return;
-    power_save_blocker_ = PowerSaveBlocker::Create(
-        PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
-        "Playing video").Pass();
-    static_cast<PowerSaveBlockerImpl*>(power_save_blocker_.get())->
-        InitDisplaySleepBlocker(GetNativeView());
-  }
-}
-
 }  // namespace content