Allow individual UI element properties to be modified.

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/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"
 
 namespace vr_shell {
 
 namespace {
 
+// Parse an integer to an int or enum value.
+template <typename T>
+bool ParseInt(const base::DictionaryValue& dict,

[tiborg, 2017/02/23 15:21:18]

+1 for the templates!

[cjgrant, 2017/02/23 16:13:37]

Acknowledged.

+              const std::string& key,
+              T* output) {
+  return dict.GetInteger(key, reinterpret_cast<int*>(output));

[tiborg, 2017/02/23 15:21:18]

Is this safe when you use a different type than int for T, e.g. short?

[cjgrant, 2017/02/23 16:13:37]

Done. It was not, but it is now.

+}
+
+// Parse a floating point number to a float or double.
+template <typename T>
 bool ParseFloat(const base::DictionaryValue& dict,
                 const std::string& key,
-                float* output) {
+                T* output) {
   double value;
   if (!dict.GetDouble(key, &value)) {
     return false;
   }
   *output = value;
   return true;
 }
 
-bool ParseRecti(const base::DictionaryValue& dict,
-                const std::string& key,
-                Recti* output) {
-  const base::DictionaryValue* item_dict;
-  if (dict.GetDictionary(key, &item_dict)) {
-    CHECK(item_dict->GetInteger("x", &output->x));
-    CHECK(item_dict->GetInteger("y", &output->y));
-    CHECK(item_dict->GetInteger("width", &output->width));
-    CHECK(item_dict->GetInteger("height", &output->height));
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool Parse2DVec3f(const base::DictionaryValue& dict,
-                  const std::string& key,
-                  gvr::Vec3f* output) {
-  const base::DictionaryValue* item_dict;
-  if (dict.GetDictionary(key, &item_dict)) {
-    double value;
-    CHECK(item_dict->GetDouble("x", &value));
-    output->x = value;
-    CHECK(item_dict->GetDouble("y", &value));
-    output->y = value;
-    output->z = 1.0f;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool ParseVec3f(const base::DictionaryValue& dict,
-                const std::string& key,
-                gvr::Vec3f* output) {
-  const base::DictionaryValue* item_dict;
-  if (dict.GetDictionary(key, &item_dict)) {
-    double value;
-    CHECK(item_dict->GetDouble("x", &value));
-    output->x = value;
-    CHECK(item_dict->GetDouble("y", &value));
-    output->y = value;
-    CHECK(item_dict->GetDouble("z", &value));
-    output->z = value;
-    return true;
-  } else {
-    return false;
-  }
-}
-
 bool ParseColorf(const base::DictionaryValue& dict,
                  const std::string& key,
                  Colorf* output) {
   const base::DictionaryValue* item_dict;
   if (dict.GetDictionary(key, &item_dict)) {
     double value;
     CHECK(item_dict->GetDouble("r", &value));
     output->r = value;
     CHECK(item_dict->GetDouble("g", &value));
     output->g = value;
     CHECK(item_dict->GetDouble("b", &value));
     output->b = value;
     CHECK(item_dict->GetDouble("a", &value));
     output->a = value;
     return true;
   } else {
     return false;
   }
 }
 
-bool ParseRotationAxisAngle(const base::DictionaryValue& dict,
-                            const std::string& key,
-                            RotationAxisAngle* output) {
-  const base::DictionaryValue* item_dict;
-  if (dict.GetDictionary(key, &item_dict)) {
-    double value;
-    CHECK(item_dict->GetDouble("x", &value));
-    output->x = value;
-    CHECK(item_dict->GetDouble("y", &value));
-    output->y = value;
-    CHECK(item_dict->GetDouble("z", &value));
-    output->z = value;
-    CHECK(item_dict->GetDouble("a", &value));
-    output->angle = value;
-    return true;
-  } else {
-    return false;
-  }
-}
-
 void ParseFloats(const base::DictionaryValue& dict,
                  const std::vector<std::string>& keys,
                  std::vector<float>* vec) {
   for (const auto& key : keys) {
     double value;
     CHECK(dict.GetDouble(key, &value)) << "parsing tag " << key;
     vec->push_back(value);
   }
 }
 
@@ skipping 18 matching lines @@
       return true;
     case Animation::Property::OPACITY:
       ParseFloats(dict, {"x"}, vec);
       return true;
   }
   return false;
 }
 
 std::unique_ptr<easing::Easing> ParseEasing(const base::DictionaryValue& dict) {
   easing::EasingType easingType;
-  CHECK(dict.GetInteger("type", reinterpret_cast<int*>(&easingType)));
+  CHECK(ParseInt(dict, "type", &easingType));
   std::unique_ptr<easing::Easing> result;
 
   switch (easingType) {
     case easing::EasingType::LINEAR: {
       result.reset(new easing::Linear());
       break;
     }
     case easing::EasingType::CUBICBEZIER: {
       double p1x, p1y, p2x, p2y;
       CHECK(dict.GetDouble("p1x", &p1x));
@@ skipping 60 matching lines @@
     CHECK_NE(GetUiElementById(element->parent_id), nullptr);
   } else {
     CHECK_EQ(element->x_anchoring, XAnchoring::XNONE);
     CHECK_EQ(element->y_anchoring, YAnchoring::YNONE);
   }
   ui_elements_.push_back(std::move(element));
 }
 
 void UiScene::AddUiElementFromDict(const base::DictionaryValue& dict) {
   int id;
-  CHECK(dict.GetInteger("id", &id));
+  CHECK(ParseInt(dict, "id", &id));
   CHECK_EQ(GetUiElementById(id), nullptr);
 
   std::unique_ptr<ContentRectangle> element(new ContentRectangle);
   element->id = id;
 
   ApplyDictToElement(dict, element.get());
   ui_elements_.push_back(std::move(element));
 }
 
 void UiScene::UpdateUiElementFromDict(const base::DictionaryValue& dict) {
   int id;
-  CHECK(dict.GetInteger("id", &id));
+  CHECK(ParseInt(dict, "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)->fill == Fill::CONTENT) {
         content_element_ = nullptr;
@@ skipping 21 matching lines @@
   Animation::Property property;
   double start_time_ms;
   double duration_ms;
 
   const base::DictionaryValue* easing_dict = nullptr;
   const base::DictionaryValue* from_dict = nullptr;
   const base::DictionaryValue* to_dict = nullptr;
   std::vector<float> from;
   std::vector<float> to;
 
-  CHECK(dict.GetInteger("id", &animation_id));
-  CHECK(dict.GetInteger("meshId", &element_id));
-  CHECK(dict.GetInteger("property", reinterpret_cast<int*>(&property)));
-  CHECK(dict.GetDouble("startInMillis", &start_time_ms));
-  CHECK(dict.GetDouble("durationMillis", &duration_ms));
+  CHECK(ParseInt(dict, "id", &animation_id));
+  CHECK(ParseInt(dict, "meshId", &element_id));
+  CHECK(ParseInt(dict, "property", &property));
+  CHECK(ParseFloat(dict, "startInMillis", &start_time_ms));
+  CHECK(ParseFloat(dict, "durationMillis", &duration_ms));
 
   CHECK(dict.GetDictionary("easing", &easing_dict));
   auto easing = ParseEasing(*easing_dict);
 
   CHECK(dict.GetDictionary("to", &to_dict));
   ParseEndpointToFloats(property, *to_dict, &to);
 
   // The start location is optional.  If not specified, the animation will
   // start from the element's current location.
   dict.GetDictionary("from", &from_dict);
@@ skipping 30 matching lines @@
 }
 
 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(dict->GetInteger("type", reinterpret_cast<int*>(&type)));
+    CHECK(ParseInt(*dict, "type", &type));
     CHECK(dict->GetDictionary("data", &data));
 
     switch (type) {
       case Command::ADD_ELEMENT:
         AddUiElementFromDict(*data);
         break;
       case Command::UPDATE_ELEMENT:
         UpdateUiElementFromDict(*data);
         break;
       case Command::REMOVE_ELEMENT: {
         int element_id;
-        CHECK(data->GetInteger("id", &element_id));
+        CHECK(ParseInt(*data, "id", &element_id));
         RemoveUiElement(element_id);
         break;
       }
       case Command::ADD_ANIMATION:
         AddAnimationFromDict(*data, time_in_micro);
         break;
       case Command::REMOVE_ANIMATION: {
         int element_id, animation_id;
-        CHECK(data->GetInteger("id", &animation_id));
-        CHECK(data->GetInteger("meshId", &element_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);
         break;
     }
   }
 }
 
@@ skipping 53 matching lines @@
     CHECK(parent != nullptr);
     ApplyAnchoring(*parent, element.x_anchoring, element.y_anchoring,
                    transform);
     ApplyRecursiveTransforms(*parent, transform, opacity);
   }
 }
 
 void UiScene::ApplyDictToElement(const base::DictionaryValue& dict,
                                  ContentRectangle* element) {
   int parent_id;
-  if (dict.GetInteger("parentId", &parent_id)) {
+
+  if (ParseInt(dict, "parentId", &parent_id)) {
     CHECK_GE(parent_id, 0);
     CHECK_NE(GetUiElementById(parent_id), nullptr);
     element->parent_id = parent_id;
   }
 
   dict.GetBoolean("visible", &element->visible);
   dict.GetBoolean("hitTestable", &element->hit_testable);
   dict.GetBoolean("lockToFov", &element->lock_to_fov);
-  Parse2DVec3f(dict, "size", &element->size);
-  ParseVec3f(dict, "scale", &element->scale);
-  ParseRotationAxisAngle(dict, "rotation", &element->rotation);
-  ParseVec3f(dict, "translation", &element->translation);
-  double opacity;
-  if (dict.GetDouble("opacity", &opacity)) {
-    element->opacity = opacity;
-  }
-  dict.GetInteger("drawPhase", &element->draw_phase);
 
-  if (dict.GetInteger("xAnchoring",
-                      reinterpret_cast<int*>(&element->x_anchoring))) {
+  ParseFloat(dict, "sizeX", &element->size.x);
+  ParseFloat(dict, "sizeY", &element->size.y);
+  ParseFloat(dict, "scaleX", &element->scale.x);
+  ParseFloat(dict, "scaleY", &element->scale.y);
+  ParseFloat(dict, "scaleZ", &element->scale.z);
+  ParseFloat(dict, "rotationX", &element->rotation.x);
+  ParseFloat(dict, "rotationY", &element->rotation.y);
+  ParseFloat(dict, "rotationZ", &element->rotation.z);
+  ParseFloat(dict, "rotationAngle", &element->rotation.angle);
+  ParseFloat(dict, "translationX", &element->translation.x);
+  ParseFloat(dict, "translationY", &element->translation.y);
+  ParseFloat(dict, "translationZ", &element->translation.z);
+
+  ParseInt(dict, "drawPhase", &element->draw_phase);
+
+  ParseFloat(dict, "opacity", &element->opacity);

[tiborg, 2017/02/23 15:21:18]

Remove new lines or move the ParseFloat to the other parse floats?

[cjgrant, 2017/02/23 16:13:37]

Done.

+  if (ParseInt(dict, "xAnchoring", &element->x_anchoring)) {
     CHECK_GE(element->parent_id, 0);
   }
-  if (dict.GetInteger("yAnchoring",
-                      reinterpret_cast<int*>(&element->y_anchoring))) {
+  if (ParseInt(dict, "yAnchoring", &element->y_anchoring)) {
     CHECK_GE(element->parent_id, 0);
   }
 
   // Parse the element fill.
-  if (dict.GetInteger("fillType", reinterpret_cast<int*>(&element->fill))) {
+  if (ParseInt(dict, "fillType", &element->fill)) {
     // If the previous content element has a new filling now make sure this is
     // tracked correctly.
     if (content_element_ == element && element->fill != Fill::CONTENT) {
       content_element_ = nullptr;
     }
 
     switch (element->fill) {
       case Fill::SPRITE:
-        CHECK(ParseRecti(dict, "copyRect", &element->copy_rect));
+        CHECK(ParseInt(dict, "copyRectX", &element->copy_rect.x));
+        CHECK(ParseInt(dict, "copyRectY", &element->copy_rect.y));
+        CHECK(ParseInt(dict, "copyRectWidth", &element->copy_rect.width));
+        CHECK(ParseInt(dict, "copyRectHeight", &element->copy_rect.height));
         break;
       case Fill::OPAQUE_GRADIENT:
         CHECK(ParseColorf(dict, "edgeColor", &element->edge_color));
         CHECK(ParseColorf(dict, "centerColor", &element->center_color));
         break;
       case Fill::GRID_GRADIENT:
         CHECK(ParseColorf(dict, "edgeColor", &element->edge_color));
         CHECK(ParseColorf(dict, "centerColor", &element->center_color));
-        CHECK(dict.GetInteger("gridlineCount", &element->gridline_count));
+        CHECK(ParseInt(dict, "gridlineCount", &element->gridline_count));
         CHECK_GE(element->gridline_count, 0);
         break;
       case Fill::CONTENT:
         CHECK_EQ(content_element_, nullptr);
         content_element_ = element;
         break;
       default:
         element->fill = Fill::NONE;
         break;
     }
   }
 }
 
 }  // namespace vr_shell