Re-land^2 WebVR compositor bypass via BrowserMain context + mailbox

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>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/vr_service.mojom.h"
+#include "ui/android/context_provider_factory.h"
+#include "gpu/ipc/client/gpu_channel_host.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace blink {
 class WebInputEvent;
 }
 
 namespace content {
 class WebContents;
 }
 
+namespace gpu {
+namespace gles2 {
+class GLES2Interface;
+}
+}
+
 namespace ui {
+class ContextProviderCommandBuffer;
 class WindowAndroid;
 }
 
 namespace vr_shell {
 
 class AndroidUiGestureTarget;
 class UiInterface;
 class VrCompositor;
 class VrGLThread;
 class VrInputManager;
@@ skipping 77 matching lines @@
 
   // html/js UI hooks.
   static base::WeakPtr<VrShell> GetWeakPtr(
       const content::WebContents* web_contents);
 
   UiInterface* GetUiInterface();
   void OnDomContentsLoaded();
 
   void UiSurfaceChanged(jobject surface);
   void ContentSurfaceChanged(jobject surface);
+  void WebVRSurfaceChanged(int surface_handle);
+  void WebVRFrameCompleted(int frame_index);
   void GvrDelegateReady();
   void AppButtonPressed();
 
   void ContentPhysicalBoundsChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width,
       jint height,
       jfloat dpr);
 
@@ skipping 34 matching lines @@
   void SetUiState();
 
   // content::WebContentsObserver implementation.
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override;
   void MainFrameWasResized(bool width_changed) override;
   void WebContentsDestroyed() override;
 
   // device::GvrDelegate implementation
   void SetWebVRSecureOrigin(bool secure_origin) override;
-  void SubmitWebVRFrame() override;
+  void SubmitWebVRFrame(int frame_index, const gpu::Mailbox& mailbox) override;
   void UpdateWebVRTextureBounds(int16_t frame_index,
                                 const gvr::Rectf& left_bounds,
                                 const gvr::Rectf& right_bounds) override;
   void OnVRVsyncProviderRequest(
       device::mojom::VRVSyncProviderRequest request) override;
   void UpdateVSyncInterval(int64_t timebase_nanos,
                            double interval_seconds) override;
   bool SupportsPresentation() override;
   void ResetPose() override;
   void CreateVRDisplayInfo(
       const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
       uint32_t device_id) override;
 
   void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
 
+  void OnWebVrGpuChannelEstablished(
+      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
+      ui::ContextProviderFactory::GpuChannelHostResult result);
+
   bool vr_shell_enabled_;
 
   std::unique_ptr<UiInterface> html_interface_;
   bool content_paused_ = false;
   bool webvr_mode_ = false;
+  int webvr_surface_handle_;
+  int webvr_frames_in_surface_queue_ = 0;
+
+  scoped_refptr<ui::ContextProviderCommandBuffer>
+      webvr_context_provider_command_buffer_;
+  gpu::gles2::GLES2Interface* webvr_surface_gl_ = nullptr;
 
   content::WebContents* main_contents_ = nullptr;
   base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_;
   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_;
 
@@ skipping 18 matching lines @@
   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_