Support rendering Android Native Pages in VR Shell.

chrome/browser/android/vr_shell/vr_shell.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 47 matching lines @@
   SET_CONTENT_PAUSED,
 };
 
 class VrMetricsHelper;
 
 // The native instance of the Java VrShell. This class is not threadsafe and
 // must only be used on the UI thread.
 class VrShell : public device::GvrDelegate, content::WebContentsObserver {
  public:
   VrShell(JNIEnv* env, jobject obj,
-          content::WebContents* main_contents,
           ui::WindowAndroid* content_window,
           content::WebContents* ui_contents,
           ui::WindowAndroid* ui_window,
           bool for_web_vr,
           VrShellDelegate* delegate,
           gvr_context* gvr_api,
           bool reprojected_rendering);
   void SwapContents(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     const base::android::JavaParamRef<jobject>& web_contents);
@@ skipping 17 matching lines @@
                              double progress);
   void OnTabListCreated(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         jobjectArray tabs, jobjectArray incognito_tabs);
   void OnTabUpdated(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     jboolean incognito, jint id, jstring jtitle);
   void OnTabRemoved(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     jboolean incognito, jint id);
+  base::android::ScopedJavaGlobalRef<jobject> TakeContentSurface(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj);
+  void RestoreContentSurface(JNIEnv* env,
+                             const base::android::JavaParamRef<jobject>& obj);
 
   void ContentWebContentsDestroyed();
   // Called when our WebContents have been hidden. Usually a sign that something
   // like another tab placed in front of it.
   void ContentWasHidden();
   void ContentWasShown();
 
   // html/js UI hooks.
   static base::WeakPtr<VrShell> GetWeakPtr(
       const content::WebContents* web_contents);
 
   UiInterface* GetUiInterface();
   void OnDomContentsLoaded();
 
-  void SurfacesChanged(jobject content_surface, jobject ui_surface);
+  void UiSurfaceChanged(jobject surface);
+  void ContentSurfaceChanged(jobject surface);
   void GvrDelegateReady();
   void AppButtonPressed();
 
   void ContentPhysicalBoundsChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width, jint height, jfloat dpr);
 
   void UIPhysicalBoundsChanged(
       JNIEnv* env,
@@ skipping 49 matching lines @@
   void CreateVRDisplayInfo(
       const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
       uint32_t device_id) override;
 
   void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
 
   std::unique_ptr<UiInterface> html_interface_;
   bool content_paused_ = false;
   bool webvr_mode_ = false;
 
-  content::WebContents* main_contents_;
+  content::WebContents* main_contents_ = nullptr;
+  ui::WindowAndroid* content_window_;
   std::unique_ptr<VrCompositor> content_compositor_;
   content::WebContents* ui_contents_;
   std::unique_ptr<VrCompositor> ui_compositor_;
 
   std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_;
 
   VrShellDelegate* delegate_provider_ = nullptr;
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
 
   std::unique_ptr<VrInputManager> content_input_manager_;
   std::unique_ptr<VrInputManager> ui_input_manager_;
   std::unique_ptr<VrMetricsHelper> metrics_helper_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   std::unique_ptr<VrGLThread> gl_thread_;
   bool reprojected_rendering_;
 
+  jobject content_surface_ = nullptr;
+
   // TODO(mthiesse): Remove the need for this to be stored here.
   // crbug.com/674594
   gvr_context* gvr_api_;
 
   base::WeakPtrFactory<VrShell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShell);
 };
 
 bool RegisterVrShell(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_