Remove last references to WebVR from blink modules

Updated an error message string to more accurately describe the WebXR
state needed to satisfy it, removed a couple of WebGL helper methods
that were only being called by WebVR previously, and removed a Gamepad
enum from the IDL that was WebVR-specific.

Bug: 1030470
Change-Id: I6a4a53240f761eed94100dd374c4504f28a99b98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949298Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721274}

third_party/blink/renderer/modules/gamepad/gamepad.idl

@@ -23,14 +23,6 @@
  * DAMAGE.
  */
 
-// https://w3c.github.io/gamepad/extensions.html#gamepadhand-enum
-[
-    RuntimeEnabled=WebVR
-] enum GamepadHand {
-  "left",
-  "right"
-};
-
 // https://www.w3.org/TR/gamepad/#gamepadmappingtype-enum
 enum GamepadMappingType {
   "",

third_party/blink/renderer/modules/webgl/webgl_framebuffer.cc

@@ -34,6 +34,10 @@ namespace blink {
 
 namespace {
 
+const char kIncompleteOpaque[] =
+    "Cannot render to a XRWebGLLayer framebuffer outside of an XRSession "
+    "animation frame callback.";
+
 class WebGLRenderbufferAttachment final
     : public WebGLFramebuffer::WebGLAttachment {
  public:
@@ -377,7 +381,7 @@ GLenum WebGLFramebuffer::CheckDepthStencilStatus(const char** reason) const {
   if (opaque_) {
     if (opaque_complete_)
       return GL_FRAMEBUFFER_COMPLETE;
-    *reason = "cannot render to a WebVR layer outside of a frame callback";
+    *reason = kIncompleteOpaque;
     return GL_FRAMEBUFFER_UNSUPPORTED;
   }
   if (Context()->IsWebGL2OrHigher() || web_gl1_depth_stencil_consistent_)

third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc

@@ -757,18 +757,6 @@ void WebGLRenderingContextBase::commit() {
   MarkLayerComposited();
 }
 
-scoped_refptr<StaticBitmapImage>
-WebGLRenderingContextBase::GetStaticBitmapImage(
-    std::unique_ptr<viz::SingleReleaseCallback>* out_release_callback) {
-  if (!GetDrawingBuffer())
-    return nullptr;
-
-  if (CreationAttributes().preserve_drawing_buffer)
-    return GetImage();
-
-  return GetDrawingBuffer()->TransferToStaticBitmapImage(out_release_callback);
-}
-
 scoped_refptr<StaticBitmapImage> WebGLRenderingContextBase::GetImage(
     AccelerationHint hint) {
   if (!GetDrawingBuffer())
@@ -777,9 +765,9 @@ scoped_refptr<StaticBitmapImage> WebGLRenderingContextBase::GetImage(
   ScopedFramebufferRestorer fbo_restorer(this);
   GetDrawingBuffer()->ResolveAndBindForReadAndDraw();
   // Use the drawing buffer size here instead of the canvas size to ensure that
-  // sizing is consistent for the GetStaticBitmapImage() result. The forced
-  // downsizing logic in Reshape() can lead to the drawing buffer being smaller
-  // than the canvas size. See https:://crbug.com/845742.
+  // sizing is consistent. The forced downsizing logic in Reshape() can lead to
+  // the drawing buffer being smaller than the canvas size.
+  // See https://crbug.com/845742.
   IntSize size = GetDrawingBuffer()->Size();
   // Since we are grabbing a snapshot that is not for compositing, we use a
   // custom resource provider. This avoids consuming compositing-specific
@@ -1502,11 +1490,6 @@ WebGLRenderingContextBase::ClearIfComposited(GLbitfield mask) {
   return combined_clear ? kCombinedClear : kJustClear;
 }
 
-void WebGLRenderingContextBase::MarkCompositedAndClearBackbufferIfNeeded() {
-  MarkLayerComposited();
-  ClearIfComposited();
-}
-
 void WebGLRenderingContextBase::RestoreScissorEnabled() {
   if (isContextLost())
     return;

third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h

@@ -606,15 +606,6 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
 
   void commit();
 
-  // For use by WebVR which doesn't use the normal compositing path.
-  // This clears the backbuffer if preserveDrawingBuffer is false.
-  void MarkCompositedAndClearBackbufferIfNeeded();
-
-  // For use by WebVR, commits the current canvas content similar
-  // to the "commit" JS API.
-  scoped_refptr<StaticBitmapImage> GetStaticBitmapImage(
-      std::unique_ptr<viz::SingleReleaseCallback>* out_release_callback);
-
   ScriptPromise makeXRCompatible(ScriptState*);
   bool IsXRCompatible();