Add menu mode plumbing for WebVR mode.

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 <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 266 matching lines @@
   auto& animations = element->animations;
   for (auto it = animations.begin(); it != animations.end(); ++it) {
     const Animation& existing_animation = **it;
     if (existing_animation.id == animation_id) {
       animations.erase(it);
       return;
     }
   }
 }
 
-void UiScene::UpdateBackgroundFromDict(const base::DictionaryValue& dict) {
-  ParseColorf(dict, "color", &background_color_);
-  ParseFloat(dict, "distance", &background_distance_);
-}
-
 void UiScene::HandleCommands(std::unique_ptr<base::ListValue> commands,
                              int64_t time_in_micro) {
   for (auto& item : *commands) {
     base::DictionaryValue* dict;
     CHECK(item->GetAsDictionary(&dict));
 
     Command type;
     base::DictionaryValue* data;
     CHECK(ParseInt(*dict, "type", &type));
     CHECK(dict->GetDictionary("data", &data));
@@ skipping 14 matching lines @@
       case Command::ADD_ANIMATION:
         AddAnimationFromDict(*data, time_in_micro);
         break;
       case Command::REMOVE_ANIMATION: {
         int element_id, animation_id;
         CHECK(ParseInt(*data, "id", &animation_id));
         CHECK(ParseInt(*data, "meshId", &element_id));
         RemoveAnimation(element_id, animation_id);
         break;
       }
-      case Command::UPDATE_BACKGROUND:
-        UpdateBackgroundFromDict(*data);
+      case Command::CONFIGURE_SCENE:
+        ParseColorf(*data, "backgroundColor", &background_color_);
+        ParseFloat(*data, "backgroundDistance", &background_distance_);
+        data->GetBoolean("drawCursor", &cursor_enabled_);
+        data->GetBoolean("drawWebVr", &webvr_rendering_enabled_);

[cjgrant, 2017/03/16 15:44:36]

We could merge this with the action "pause content", or keep them separate.  I'd
prefer to merge them, unless there's disagreement.

[tiborg, 2017/03/16 19:40:22]

+1 for merging.

[cjgrant, 2017/03/20 15:34:57]

In the end, I merged the two rendering properties, but not the pausing.  Pausing
is done by a separate native system, and linking them is messy.

[tiborg, 2017/03/20 15:56:08]

SGTM.

         break;
     }
   }
 }
 
 void UiScene::UpdateTransforms(int64_t time_in_micro) {
   // Process all animations before calculating object transforms.
   for (auto& element : ui_elements_) {
     element->Animate(time_in_micro);
   }
@@ skipping 10 matching lines @@
 
 ContentRectangle* UiScene::GetUiElementById(int element_id) {
   for (auto& element : ui_elements_) {
     if (element->id == element_id) {
       return element.get();
     }
   }
   return nullptr;
 }
 
-const Colorf& UiScene::GetBackgroundColor() {
+const Colorf& UiScene::GetBackgroundColor() const {

[tiborg, 2017/03/16 19:40:22]

+1 for const!

   return background_color_;
 }
 
-float UiScene::GetBackgroundDistance() {
+float UiScene::GetBackgroundDistance() const {
   return background_distance_;
 }
 
+bool UiScene::GetCursorEnabled() const {
+  return cursor_enabled_;
+}
+
+bool UiScene::GetWebVrRenderingEnabled() const {
+  return webvr_rendering_enabled_;
+}
+
 const std::vector<std::unique_ptr<ContentRectangle>>& UiScene::GetUiElements()
     const {
   return ui_elements_;
 }
 
 UiScene::UiScene() = default;
 
 UiScene::~UiScene() = default;
 
 void UiScene::ApplyRecursiveTransforms(const ContentRectangle& element,
@@ skipping 81 matching lines @@
         content_element_ = element;
         break;
       default:
         element->fill = Fill::NONE;
         break;
     }
   }
 }
 
 }  // namespace vr_shell