VrShell background implemented in JS.

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 <vector>
 
@@ skipping 57 matching lines @@
   EXPECT_EQ(scene.GetUiElements().size(), 0u);
 }
 
 TEST(UiScene, AddRemoveContentQuad) {
   UiScene scene;
 
   EXPECT_EQ(scene.GetContentQuad(), nullptr);
 
   base::DictionaryValue dict;
   dict.SetInteger("id", 0);
-  dict.SetBoolean("contentQuad", true);
+  dict.SetInteger("fillType", Fill::CONTENT);
   scene.AddUiElementFromDict(dict);
   EXPECT_NE(scene.GetContentQuad(), nullptr);
 
-  dict.SetBoolean("contentQuad", false);
+  dict.SetInteger("fillType", Fill::SPRITE);
   scene.UpdateUiElementFromDict(dict);
   EXPECT_EQ(scene.GetContentQuad(), nullptr);
 
-  dict.SetBoolean("contentQuad", true);
+  dict.SetInteger("fillType", Fill::CONTENT);
   scene.UpdateUiElementFromDict(dict);
   EXPECT_NE(scene.GetContentQuad(), nullptr);
 
   scene.RemoveUiElement(0);
   EXPECT_EQ(scene.GetContentQuad(), nullptr);
 }
 
 TEST(UiScene, AddRemoveAnimations) {
   UiScene scene;
   addElement(&scene, 0);
@@ skipping 132 matching lines @@
   UiScene scene;
   addElement(&scene, 11);
 
   base::DictionaryValue dict;
 
   dict.SetInteger("id", 10);
   dict.SetInteger("parentId", 11);
   dict.SetBoolean("visible", false);
   dict.SetBoolean("hitTestable", false);
   dict.SetBoolean("lockToFov", true);
-  dict.SetBoolean("contentQuad", 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));
@@ skipping 24 matching lines @@
 
   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);
-  EXPECT_EQ(element->content_quad, true);
+  EXPECT_EQ(element->fill, Fill::SPRITE);
   EXPECT_EQ(element->x_anchoring, XAnchoring::XLEFT);
   EXPECT_EQ(element->y_anchoring, YAnchoring::YTOP);
   EXPECT_FLOAT_EQ(element->opacity, 0.357);
 
   EXPECT_EQ(element->copy_rect.x, 100);
   EXPECT_EQ(element->copy_rect.y, 101);
   EXPECT_EQ(element->copy_rect.width, 102);
   EXPECT_EQ(element->copy_rect.height, 103);
 
   EXPECT_FLOAT_EQ(element->size.x, 200);
   EXPECT_FLOAT_EQ(element->size.y, 201);
   EXPECT_FLOAT_EQ(element->size.z, 1);
 
   EXPECT_FLOAT_EQ(element->scale.x, 300);
   EXPECT_FLOAT_EQ(element->scale.y, 301);
   EXPECT_FLOAT_EQ(element->scale.z, 302);
 
   EXPECT_FLOAT_EQ(element->rotation.x, 400);
   EXPECT_FLOAT_EQ(element->rotation.y, 401);
   EXPECT_FLOAT_EQ(element->rotation.z, 402);
   EXPECT_FLOAT_EQ(element->rotation.angle, 403);
 
   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;
+  constexpr double EPSILON = 0.000001;

[cjgrant, 2017/02/02 14:48:25]

This can be removed (see below).

[tiborg1, 2017/02/02 16:52:27]

Done.

+
+  base::DictionaryValue copy_rect;
+  copy_rect.SetInteger("x", 1);
+  copy_rect.SetInteger("y", 2);
+  copy_rect.SetInteger("width", 3);
+  copy_rect.SetInteger("height", 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.
+  dict.Clear();
+  dict.SetInteger("id", 10);
+  dict.SetInteger("fillType", Fill::OPAQUE_GRADIENT);
+  dict.Set("edgeColor", edge_color.DeepCopy());
+  dict.Set("centerColor", center_color.DeepCopy());
+  scene.AddUiElementFromDict(dict);
+  element = scene.GetUiElementById(10);
+
+  EXPECT_EQ(element->fill, Fill::OPAQUE_GRADIENT);
+  EXPECT_NEAR(element->edge_color.r, 0.1, EPSILON);

[cjgrant, 2017/02/02 14:48:25]

I think you want EXPECT_FLOAT_EQ() for these cases, as in the other test cases.

[tiborg1, 2017/02/02 16:52:27]

Oh yes, this makes it way more elegant :) Done.

+  EXPECT_NEAR(element->edge_color.g, 0.2, EPSILON);
+  EXPECT_NEAR(element->edge_color.b, 0.3, EPSILON);
+  EXPECT_NEAR(element->edge_color.a, 0.4, EPSILON);
+  EXPECT_NEAR(element->center_color.r, 0.5, EPSILON);
+  EXPECT_NEAR(element->center_color.g, 0.6, EPSILON);
+  EXPECT_NEAR(element->center_color.b, 0.7, EPSILON);
+  EXPECT_NEAR(element->center_color.a, 0.8, EPSILON);
+
+  // Test GRID_GRADIENT filling.
+  dict.Clear();
+  dict.SetInteger("id", 11);
+  dict.SetInteger("fillType", Fill::GRID_GRADIENT);
+  dict.Set("edgeColor", edge_color.DeepCopy());
+  dict.Set("centerColor", center_color.DeepCopy());
+  dict.SetInteger("tileNumber", 10);
+  scene.AddUiElementFromDict(dict);
+  element = scene.GetUiElementById(11);
+
+  EXPECT_EQ(element->fill, Fill::GRID_GRADIENT);
+  EXPECT_NEAR(element->edge_color.r, 0.1, EPSILON);
+  EXPECT_NEAR(element->edge_color.g, 0.2, EPSILON);
+  EXPECT_NEAR(element->edge_color.b, 0.3, EPSILON);
+  EXPECT_NEAR(element->edge_color.a, 0.4, EPSILON);
+  EXPECT_NEAR(element->center_color.r, 0.5, EPSILON);
+  EXPECT_NEAR(element->center_color.g, 0.6, EPSILON);
+  EXPECT_NEAR(element->center_color.b, 0.7, EPSILON);
+  EXPECT_NEAR(element->center_color.a, 0.8, EPSILON);
+  EXPECT_EQ(element->tile_number, 10u);
+
+  // Test CONTENT filling.
+  dict.Clear();
+  dict.SetInteger("id", 12);
+  dict.SetInteger("fillType", Fill::CONTENT);
+  scene.AddUiElementFromDict(dict);
+  element = scene.GetUiElementById(12);
+
+  EXPECT_EQ(element->fill, Fill::CONTENT);
+}
+
 TEST(UiScene, AddAnimationFromDictionary) {
   UiScene scene;
   addElement(&scene, 0);
 
   base::DictionaryValue dict;
 
   dict.SetInteger("id", 10);
   dict.SetInteger("meshId", 0);
   dict.SetDouble("startInMillis", 12345);
   dict.SetDouble("durationMillis", 54321);
@@ skipping 36 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