Revert of WebVR: fix focus while presenting

third_party/WebKit/Source/modules/vr/VRDisplay.cpp

 // Copyright 2016 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 "modules/vr/VRDisplay.h"
 
 #include "core/css/StylePropertySet.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/FrameRequestCallback.h"
 #include "core/dom/ScriptedAnimationController.h"
 #include "core/dom/TaskRunnerHelper.h"
-#include "core/frame/Frame.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/loader/DocumentLoader.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "modules/EventTargetModules.h"
@@ skipping 75 matching lines @@
     stage_parameters_->Update(display->stageParameters);
   } else {
     stage_parameters_ = nullptr;
   }
 
   if (need_on_present_change) {
     OnPresentChange();
   }
 }
 
-bool VRDisplay::IsPresentationFocused() {
-  if (!navigator_vr_)
-    return false;
-
-  if (navigator_vr_->IsFocused())
-    return true;
-
-  auto doc = navigator_vr_->GetDocument();
-  if (!doc)
-    return false;
-
-  // Check if this is an embedded iframe without focus. If a local parent is
-  // focused, continue presenting.
-
-  Frame* frame = doc->GetFrame();
-  for (; frame; frame = frame->Tree().Parent()) {
-    if (!frame->IsLocalFrame())
-      break;
-    auto frame_doc = ToLocalFrame(frame)->GetDocument();
-    if (frame_doc && frame_doc->hasFocus()) {
-      DVLOG(3) << __FUNCTION__ << ": a parent frame is focused";
-      return true;
-    }
-  }
-
-  return false;
-}
-
 bool VRDisplay::getFrameData(VRFrameData* frame_data) {
-  if (!IsPresentationFocused() || !frame_pose_ || display_blurred_)
+  if (!navigator_vr_->IsFocused() || !frame_pose_ || display_blurred_)
     return false;
 
   if (!frame_data)
     return false;
 
   if (depth_near_ == depth_far_)
     return false;
 
   return frame_data->Update(frame_pose_, eye_parameters_left_,
                             eye_parameters_right_, depth_near_, depth_far_);
@@ skipping 621 matching lines @@
   // this is due to WaitForIncomingMethodCall receiving the OnVSync
   // but queueing it for immediate execution since it doesn't match
   // the interface being waited on.
   Platform::Current()->CurrentThread()->GetWebTaskRunner()->PostTask(
       BLINK_FROM_HERE,
       WTF::Bind(&VRDisplay::ProcessScheduledAnimations,
                 WrapWeakPersistent(this), timebase_ + time_delta.InSecondsF()));
 }
 
 void VRDisplay::ConnectVSyncProvider() {
-  DVLOG(1) << __FUNCTION__
-           << ": IsPresentationFocused()=" << IsPresentationFocused()
-           << " vr_v_sync_provider_.is_bound()="
-           << vr_v_sync_provider_.is_bound();
-  if (!IsPresentationFocused() || vr_v_sync_provider_.is_bound())
+  if (!navigator_vr_->IsFocused() || vr_v_sync_provider_.is_bound())
     return;
   display_->GetVRVSyncProvider(mojo::MakeRequest(&vr_v_sync_provider_));
   vr_v_sync_provider_.set_connection_error_handler(ConvertToBaseCallback(
       WTF::Bind(&VRDisplay::OnVSyncConnectionError, WrapWeakPersistent(this))));
   if (pending_raf_ && !display_blurred_) {
     pending_vsync_ = true;
     vr_v_sync_provider_->GetVSync(ConvertToBaseCallback(
         WTF::Bind(&VRDisplay::OnVSync, WrapWeakPersistent(this))));
   }
 }
@@ skipping 52 matching lines @@
   visitor->Trace(stage_parameters_);
   visitor->Trace(eye_parameters_left_);
   visitor->Trace(eye_parameters_right_);
   visitor->Trace(layer_);
   visitor->Trace(rendering_context_);
   visitor->Trace(scripted_animation_controller_);
   visitor->Trace(pending_present_resolvers_);
 }
 
 }  // namespace blink