| Index: chrome/browser/android/vr_shell/ui_elements.h
|
| diff --git a/chrome/browser/android/vr_shell/ui_elements.h b/chrome/browser/android/vr_shell/ui_elements.h
|
| index 42c349058508660b945750d247c88f5696d33354..dac66bf1af5d2546fa60219f37bff86d32a8c993 100644
|
| --- a/chrome/browser/android/vr_shell/ui_elements.h
|
| +++ b/chrome/browser/android/vr_shell/ui_elements.h
|
| @@ -28,6 +28,22 @@ enum YAnchoring {
|
| YBOTTOM
|
| };
|
|
|
| +enum Fill {
|
| + NONE = 0,
|
| + // The element is filled with part of the HTML UI as specified by the copy
|
| + // rect.
|
| + SPRITE = 1,
|
| + // The element is filled with a radial gradient as specified by the edge and
|
| + // center color.
|
| + OPAQUE_GRADIENT = 2,
|
| + // Same as OPAQUE_GRADIENT but the element is drawn as a grid.
|
| + GRID_GRADIENT = 3,
|
| + // The element is filled with the content web site. Only one content element
|
| + // may be added to the
|
| + // scene.
|
| + CONTENT = 4
|
| +};
|
| +
|
| struct ReversibleTransform {
|
| ReversibleTransform();
|
|
|
| @@ -72,7 +88,7 @@ struct ContentRectangle : public WorldRectangle {
|
| // Valid IDs are non-negative.
|
| int id = -1;
|
|
|
| - // If a non-negative parent ID is specified, applicable tranformations
|
| + // If a non-negative parent ID is specified, applicable transformations
|
| // are applied relative to the parent, rather than absolutely.
|
| int parent_id = -1;
|
|
|
| @@ -86,10 +102,6 @@ struct ContentRectangle : public WorldRectangle {
|
| // rather than the world.
|
| bool lock_to_fov = false;
|
|
|
| - // If true, this element is the content quad. Only one content quad may be
|
| - // added to the scene.
|
| - bool content_quad = false;
|
| -
|
| // Specifies the region (in pixels) of a texture to render.
|
| Recti copy_rect = {0, 0, 0, 0};
|
|
|
| @@ -121,6 +133,13 @@ struct ContentRectangle : public WorldRectangle {
|
| // Animations that affect the properties of the object over time.
|
| std::vector<std::unique_ptr<Animation>> animations;
|
|
|
| + Fill fill = Fill::NONE;
|
| +
|
| + Colorf edge_color = {1.0f, 1.0f, 1.0f, 1.0f};
|
| + Colorf center_color = {1.0f, 1.0f, 1.0f, 1.0f};
|
| +
|
| + int gridline_count = 1;
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ContentRectangle);
|
| };
|
|
|