Remove ContextClient from NavigatorVR

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

 // Copyright 2015 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/NavigatorVR.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
@@ skipping 17 matching lines @@
   if (!document.frame() || !document.frame()->domWindow())
     return 0;
   Navigator& navigator = *document.frame()->domWindow()->navigator();
   return &from(navigator);
 }
 
 NavigatorVR& NavigatorVR::from(Navigator& navigator) {
   NavigatorVR* supplement = static_cast<NavigatorVR*>(
       Supplement<Navigator>::from(navigator, supplementName()));
   if (!supplement) {
-    supplement = new NavigatorVR(navigator.frame());
+    supplement = new NavigatorVR(navigator);
     provideTo(navigator, supplementName(), supplement);
   }
   return *supplement;
 }
 
 ScriptPromise NavigatorVR::getVRDisplays(ScriptState* scriptState,
                                          Navigator& navigator) {
   return NavigatorVR::from(navigator).getVRDisplays(scriptState);
 }
 
 ScriptPromise NavigatorVR::getVRDisplays(ScriptState* scriptState) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
-  Document* document = frame() ? frame()->document() : 0;
-
-  if (!document || !controller()) {
+  if (!document()) {
     DOMException* exception = DOMException::create(
         InvalidStateError, "The object is no longer associated to a document.");
     resolver->reject(exception);
     return promise;
   }
 
-  UseCounter::count(*document, UseCounter::VRGetDisplays);
+  UseCounter::count(*document(), UseCounter::VRGetDisplays);
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   if (!executionContext->isSecureContext())
-    UseCounter::count(*document, UseCounter::VRGetDisplaysInsecureOrigin);
+    UseCounter::count(*document(), UseCounter::VRGetDisplaysInsecureOrigin);
 
-  Platform::current()->recordRapporURL("VR.WebVR.GetDisplays", document->url());
+  Platform::current()->recordRapporURL("VR.WebVR.GetDisplays",
+                                       document()->url());
 
   controller()->getDisplays(resolver);
 
   return promise;
 }
 
 VRController* NavigatorVR::controller() {
-  if (!frame())
+  if (!host()->frame())
     return 0;
 
   if (!m_controller) {
     m_controller = new VRController(this);
   }
 
   return m_controller;
 }
 
 Document* NavigatorVR::document() {
-  return frame() ? frame()->document() : 0;
+  return host()->frame() ? host()->frame()->document() : nullptr;
 }
 
 DEFINE_TRACE(NavigatorVR) {
   visitor->trace(m_controller);
-
   Supplement<Navigator>::trace(visitor);
-  ContextClient::trace(visitor);
   PageVisibilityObserver::trace(visitor);
 }
 
-NavigatorVR::NavigatorVR(LocalFrame* frame)
-    : ContextClient(frame), PageVisibilityObserver(frame->page()) {
-  frame->domWindow()->registerEventListenerObserver(this);
+NavigatorVR::NavigatorVR(Navigator& navigator)
+    : Supplement<Navigator>(navigator),
+      PageVisibilityObserver(navigator.frame()->page()) {
+  navigator.frame()->domWindow()->registerEventListenerObserver(this);
 }
 
 NavigatorVR::~NavigatorVR() {}
 
 const char* NavigatorVR::supplementName() {
   return "NavigatorVR";
 }
 
 void NavigatorVR::enqueueVREvent(VRDisplayEvent* event) {
-  // TODO(dcheng): Why does this need to check both frame and domWindow?
-  if (frame() && frame()->domWindow()) {
-    frame()->domWindow()->enqueueWindowEvent(event);
+  if (host()->frame()) {
+    host()->frame()->domWindow()->enqueueWindowEvent(event);
   }
 }
 
 void NavigatorVR::dispatchVRGestureEvent(VRDisplayEvent* event) {
-  // TODO(dcheng): Why does this need to check both frame and domWindow?
-  if (frame() && frame()->domWindow()) {
-    UserGestureIndicator gestureIndicator(
-        DocumentUserGestureToken::create(frame()->document()));
-    event->setTarget(frame()->domWindow());
-    frame()->domWindow()->dispatchEvent(event);
-  }
+  if (host()->frame())

[sof, 2017/01/05 13:22:28]

if (!host()->frame())

+    return;
+  UserGestureIndicator gestureIndicator(
+      DocumentUserGestureToken::create(document()));
+  LocalDOMWindow* window = host()->frame()->domWindow();

[sof, 2017/01/05 13:22:28]

DCHECK (or comment) against non-obvious non-nullness would be useful; i.e., a
NavigatorVR cannot be constructed without a |domWindow()|, and it isn't
subsequently cleared on the frame, so it must be non-null.

+  event->setTarget(window);
+  window->dispatchEvent(event);
 }
 
 void NavigatorVR::pageVisibilityChanged() {
   if (!page())
     return;
   if (m_controller) {
     m_controller->setListeningForActivate(page()->isPageVisible() &&
                                           m_listeningForActivate);
   }
 }
@@ skipping 20 matching lines @@
 }
 
 void NavigatorVR::didRemoveAllEventListeners(LocalDOMWindow* window) {
   if (m_controller) {
     m_controller->setListeningForActivate(false);
     m_listeningForActivate = false;
   }
 }
 
 }  // namespace blink