| Index: chrome/browser/android/vr_shell/ui_element.h
|
| diff --git a/chrome/browser/android/vr_shell/ui_element.h b/chrome/browser/android/vr_shell/ui_element.h
|
| index 3f409743220d7dfe53623ae903adbe026b3b0e6f..95a146104e5668b8b59faaf85dbb3496fdd9065e 100644
|
| --- a/chrome/browser/android/vr_shell/ui_element.h
|
| +++ b/chrome/browser/android/vr_shell/ui_element.h
|
| @@ -19,6 +19,7 @@ class TimeTicks;
|
| namespace vr_shell {
|
|
|
| class Animation;
|
| +class VrShellRenderer;
|
|
|
| enum XAnchoring {
|
| XNONE = 0,
|
| @@ -34,16 +35,15 @@ enum YAnchoring {
|
|
|
| enum Fill {
|
| NONE = 0,
|
| - SKIA = 1,
|
| + // The element is filled with the content web site. Only one content element
|
| + // may be added to the
|
| + // scene.
|
| + CONTENT = 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 Transform {
|
| @@ -86,7 +86,7 @@ class WorldRectangle {
|
|
|
| struct UiElement : public WorldRectangle {
|
| UiElement();
|
| - ~UiElement();
|
| + virtual ~UiElement();
|
|
|
| void Animate(const base::TimeTicks& time);
|
|
|
| @@ -96,6 +96,8 @@ struct UiElement : public WorldRectangle {
|
| // Indicates whether the element should be tested for cursor input.
|
| bool IsHitTestable() const;
|
|
|
| + virtual bool Render(VrShellRenderer* renderer) const;
|
| +
|
| // Valid IDs are non-negative.
|
| int id = -1;
|
|
|
|
|