Changed VRLayer's left/rightBounds to match the spec

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

 // 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.
 
 #include "modules/vr/VRDisplay.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Fullscreen.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
@@ skipping 193 matching lines @@
 
     CanvasRenderingContext* renderingContext = m_layer.source()->renderingContext();
 
     if (!renderingContext || !renderingContext->is3d()) {
         forceExitPresent();
         DOMException* exception = DOMException::create(InvalidStateError, "Layer source must have a WebGLRenderingContext");
         resolver->reject(exception);
         return promise;
     }
 
+    if ((m_layer.leftBounds().size() != 0 && m_layer.leftBounds().size() != 4)
+        || (m_layer.rightBounds().size() != 0 && m_layer.rightBounds().size() != 4)) {
+        forceExitPresent();
+        DOMException* exception = DOMException::create(InvalidStateError, "Layer bounds must either be an empty array or have 4 values");
+        resolver->reject(exception);
+        return promise;
+    }
+
     if (!m_capabilities->hasExternalDisplay()) {
         // TODO: Need a proper VR compositor, but for the moment on mobile
         // we'll just make the canvas fullscreen so that VrShell can pick it
         // up through the standard (high latency) compositing path.
         Fullscreen::requestFullscreen(*m_layer.source(), Fullscreen::UnprefixedRequest);
 
         // Check to see if the canvas is still the current fullscreen
         // element once per second.
         m_fullscreenCheckTimer.startRepeating(1.0, BLINK_FROM_HERE);
     }
@@ skipping 64 matching lines @@
 
     m_isPresenting = false;
 }
 
 void VRDisplay::updateLayerBounds()
 {
     // Set up the texture bounds for the provided layer
     device::blink::VRLayerBoundsPtr leftBounds = device::blink::VRLayerBounds::New();
     device::blink::VRLayerBoundsPtr rightBounds = device::blink::VRLayerBounds::New();
 
-    if (m_layer.hasLeftBounds()) {
+    if (m_layer.leftBounds().size() == 4) {
         leftBounds->left = m_layer.leftBounds()[0];
         leftBounds->top = m_layer.leftBounds()[1];
         leftBounds->width = m_layer.leftBounds()[2];
         leftBounds->height = m_layer.leftBounds()[3];
     } else {
         // Left eye defaults
         leftBounds->left = 0.0f;
         leftBounds->top = 0.0f;
         leftBounds->width = 0.5f;
         leftBounds->height = 1.0f;
     }
 
-    if (m_layer.hasRightBounds()) {
+    if (m_layer.rightBounds().size() == 4) {
         rightBounds->left = m_layer.rightBounds()[0];
         rightBounds->top = m_layer.rightBounds()[1];
         rightBounds->width = m_layer.rightBounds()[2];
         rightBounds->height = m_layer.rightBounds()[3];
     } else {
         // Right eye defaults
         rightBounds->left = 0.5f;
         rightBounds->top = 0.0f;
         rightBounds->width = 0.5f;
         rightBounds->height = 1.0f;
@@ skipping 38 matching lines @@
 {
     visitor->trace(m_navigatorVR);
     visitor->trace(m_capabilities);
     visitor->trace(m_stageParameters);
     visitor->trace(m_eyeParametersLeft);
     visitor->trace(m_eyeParametersRight);
     visitor->trace(m_layer);
 }
 
 } // namespace blink