Revert of 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>
@@ skipping 14 matching lines @@
 }
 
 namespace blink {
 class WebInputEvent;
 }
 
 namespace content {
 class WebContents;
 }
 
-namespace gpu {
-struct MailboxHolder;
-}
-
 namespace ui {
 class WindowAndroid;
 }
 
 namespace vr_shell {
 
 class AndroidUiGestureTarget;
 class UiInterface;
 class VrCompositor;
 class VrGLThread;
@@ skipping 117 matching lines @@
 
   void ForceExitVr();
 
   void ProcessUIGesture(std::unique_ptr<blink::WebInputEvent> event);
   void ProcessContentGesture(std::unique_ptr<blink::WebInputEvent> event);
 
   // TODO(mthiesse): Find a better place for these functions to live.
   static device::mojom::VRPosePtr VRPosePtrFromGvrPose(gvr::Mat4f head_mat);
   static device::mojom::VRDisplayInfoPtr CreateVRDisplayInfo(
       gvr::GvrApi* gvr_api,
-      gvr::Sizei recommended_size,
+      gvr::Sizei compositor_size,
       uint32_t device_id);
 
  private:
   ~VrShell() override;
   void PostToGlThreadWhenReady(const base::Closure& task);
   void SetContentPaused(bool paused);
   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(int16_t frame_index,
-                        const gpu::MailboxHolder& mailbox) override;
+  void SubmitWebVRFrame() override;
   void UpdateWebVRTextureBounds(int16_t frame_index,
                                 const gvr::Rectf& left_bounds,
-                                const gvr::Rectf& right_bounds,
-                                const gvr::Sizei& source_size) override;
+                                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;
 
@@ skipping 35 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_