Control the VrShell content quad via the HTML UI.

chrome/browser/android/vr_shell/ui_scene.cc

 // 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 "chrome/browser/android/vr_shell/ui_scene.h"
 
 #include "base/values.h"
 #include "chrome/browser/android/vr_shell/animation.h"
 #include "chrome/browser/android/vr_shell/easing.h"
 #include "chrome/browser/android/vr_shell/ui_elements.h"
@@ skipping 184 matching lines @@
   int id;
   CHECK(dict.GetInteger("id", &id));
   ContentRectangle* element = GetUiElementById(id);
   CHECK_NE(element, nullptr);
   ApplyDictToElement(dict, element);
 }
 
 void UiScene::RemoveUiElement(int element_id) {
   for (auto it = ui_elements_.begin(); it != ui_elements_.end(); ++it) {
     if ((*it)->id == element_id) {
+      if ((*it)->content_quad) {
+        content_quad_ = nullptr;
+      }
       ui_elements_.erase(it);
       return;
     }
   }
 }
 
 void UiScene::AddAnimation(int element_id,
                            std::unique_ptr<Animation>& animation) {
   ContentRectangle* element = GetUiElementById(element_id);
   CHECK_NE(element, nullptr);
@@ skipping 113 matching lines @@
 
 ContentRectangle* UiScene::GetUiElementById(int element_id) {
   for (auto& element : ui_elements_) {
     if (element->id == element_id) {
       return element.get();
     }
   }
   return nullptr;
 }
 
+ContentRectangle* UiScene::GetContentQuad() {
+  return content_quad_;
+}
+
 const std::vector<std::unique_ptr<ContentRectangle>>&
 UiScene::GetUiElements() const {
   return ui_elements_;
 }
 
 UiScene::UiScene() = default;
 
 UiScene::~UiScene() = default;
 
 int64_t UiScene::TimeInMicroseconds() {
@@ skipping 29 matching lines @@
 
   dict.GetBoolean("visible", &element->visible);
   dict.GetBoolean("hitTestable", &element->hit_testable);
   dict.GetBoolean("lockToFov", &element->lock_to_fov);
   ParseRecti(dict, "copyRect", &element->copy_rect);
   Parse2DVec3f(dict, "size", &element->size);
   ParseVec3f(dict, "scale", &element->scale);
   ParseRotationAxisAngle(dict, "rotation", &element->rotation);
   ParseVec3f(dict, "translation", &element->translation);
 
+  if (dict.GetBoolean("contentQuad", &element->content_quad)) {
+    if (element-content_quad_) {

[mthiesse, 2016/10/24 14:23:08]

typo here?

[cjgrant, 2016/10/24 14:28:21]

Are you saying you don't think this would compile?  ;)

Yeah, this is what happens when you refactor between the compile and upload
steps.  Sorry!

[cjgrant, 2016/10/26 01:10:00]

Done.

+      CHECK_EQ(content_quad_, nullptr);
+      content_quad_ = element;

[bshe, 2016/10/24 18:09:38]

nit: rename to content_element_ since it caches an element.

[cjgrant, 2016/10/26 01:10:00]

Done.

+    } else {
+      if (content_quad_ == element) {
+        content_quad_ = nullptr;
+      }
+    }
+  }
+
   if (dict.GetInteger("xAnchoring",
                       reinterpret_cast<int*>(&element->x_anchoring))) {
     CHECK_GE(element->parent_id, 0);
   }
   if (dict.GetInteger("yAnchoring",
                       reinterpret_cast<int*>(&element->y_anchoring))) {
     CHECK_GE(element->parent_id, 0);
   }
 }
 
 }  // namespace vr_shell