Allow individual UI element properties to be modified.

chrome/browser/android/vr_shell/ui_scene_unittest.cc

 // Copyright (c) 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"
 
 #define _USE_MATH_DEFINES  // For M_PI in MSVC.
 #include <cmath>
 #include <utility>
 #include <vector>
@@ skipping 204 matching lines @@
   dict.SetInteger("id", 10);
   dict.SetInteger("parentId", 11);
   dict.SetBoolean("visible", false);
   dict.SetBoolean("hitTestable", false);
   dict.SetBoolean("lockToFov", true);
   dict.SetInteger("fillType", Fill::SPRITE);
   dict.SetInteger("xAnchoring", XAnchoring::XLEFT);
   dict.SetInteger("yAnchoring", YAnchoring::YTOP);
   dict.SetDouble("opacity", 0.357);
 
-  std::unique_ptr<base::DictionaryValue> copy_rect(new base::DictionaryValue);
-  copy_rect->SetInteger("x", 100);
-  copy_rect->SetInteger("y", 101);
-  copy_rect->SetInteger("width", 102);
-  copy_rect->SetInteger("height", 103);
-  dict.Set("copyRect", std::move(copy_rect));
+  dict.SetInteger("copyRectX", 100);
+  dict.SetInteger("copyRectY", 101);
+  dict.SetInteger("copyRectWidth", 102);
+  dict.SetInteger("copyRectHeight", 103);
 
-  std::unique_ptr<base::DictionaryValue> size(new base::DictionaryValue);
-  size->SetDouble("x", 200);
-  size->SetDouble("y", 201);
-  dict.Set("size", std::move(size));
+  dict.SetDouble("sizeX", 200);
+  dict.SetDouble("sizeY", 201);
 
-  std::unique_ptr<base::DictionaryValue> scale(new base::DictionaryValue);
-  scale->SetDouble("x", 300);
-  scale->SetDouble("y", 301);
-  scale->SetDouble("z", 302);
-  dict.Set("scale", std::move(scale));
+  dict.SetDouble("scaleX", 300);
+  dict.SetDouble("scaleY", 301);
+  dict.SetDouble("scaleZ", 302);
 
-  std::unique_ptr<base::DictionaryValue> rotation(new base::DictionaryValue);
-  rotation->SetDouble("x", 400);
-  rotation->SetDouble("y", 401);
-  rotation->SetDouble("z", 402);
-  rotation->SetDouble("a", 403);
-  dict.Set("rotation", std::move(rotation));
+  dict.SetDouble("rotationX", 400);
+  dict.SetDouble("rotationY", 401);
+  dict.SetDouble("rotationZ", 402);
+  dict.SetDouble("rotationAngle", 403);
 
-  std::unique_ptr<base::DictionaryValue> translation(new base::DictionaryValue);
-  translation->SetDouble("x", 500);
-  translation->SetDouble("y", 501);
-  translation->SetDouble("z", 502);
-  dict.Set("translation", std::move(translation));
+  dict.SetDouble("translationX", 500);
+  dict.SetDouble("translationY", 501);
+  dict.SetDouble("translationZ", 502);
 
   scene.AddUiElementFromDict(dict);
   const auto* element = scene.GetUiElementById(10);
   EXPECT_NE(element, nullptr);
 
   EXPECT_EQ(element->id, 10);
   EXPECT_EQ(element->parent_id, 11);
   EXPECT_EQ(element->visible, false);
   EXPECT_EQ(element->hit_testable, false);
   EXPECT_EQ(element->lock_to_fov, true);
@@ skipping 22 matching lines @@
 
   EXPECT_FLOAT_EQ(element->translation.x, 500);
   EXPECT_FLOAT_EQ(element->translation.y, 501);
   EXPECT_FLOAT_EQ(element->translation.z, 502);
 }
 
 TEST(UiScene, AddUiElementFromDictionary_Fill) {
   UiScene scene;
   base::DictionaryValue dict;
 
-  base::DictionaryValue copy_rect;
-  copy_rect.SetInteger("x", 1);
-  copy_rect.SetInteger("y", 2);
-  copy_rect.SetInteger("width", 3);
-  copy_rect.SetInteger("height", 4);
+  dict.SetInteger("copyRectX", 1);
+  dict.SetInteger("copyRectY", 2);
+  dict.SetInteger("copyRectWidth", 3);
+  dict.SetInteger("copyRectHeight", 4);
 
   base::DictionaryValue edge_color;
   edge_color.SetDouble("r", 0.1);
   edge_color.SetDouble("g", 0.2);
   edge_color.SetDouble("b", 0.3);
   edge_color.SetDouble("a", 0.4);
 
   base::DictionaryValue center_color;
   center_color.SetDouble("r", 0.5);
   center_color.SetDouble("g", 0.6);
   center_color.SetDouble("b", 0.7);
   center_color.SetDouble("a", 0.8);
 
   // Test SPRITE filling.
   dict.SetInteger("id", 9);
   dict.SetInteger("fillType", Fill::SPRITE);
-  dict.Set("copyRect", copy_rect.DeepCopy());
   scene.AddUiElementFromDict(dict);
   const auto* element = scene.GetUiElementById(9);
 
   EXPECT_EQ(element->fill, Fill::SPRITE);
   EXPECT_EQ(element->copy_rect.x, 1);
   EXPECT_EQ(element->copy_rect.y, 2);
   EXPECT_EQ(element->copy_rect.width, 3);
   EXPECT_EQ(element->copy_rect.height, 4);
 
   // Test OPAQUE_GRADIENT filling.
@@ skipping 95 matching lines @@
   EXPECT_FLOAT_EQ(animation->from[0], 300);
   EXPECT_FLOAT_EQ(animation->from[1], 301);
   EXPECT_FLOAT_EQ(animation->from[2], 302);
   EXPECT_FLOAT_EQ(animation->from[3], 303);
 
   EXPECT_EQ(animation->start, 22345000);
   EXPECT_EQ(animation->duration, 54321000);
 }
 
 }  // namespace vr_shell