OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ |
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 int64_t time_in_micro); | 64 int64_t time_in_micro); |
65 | 65 |
66 const std::vector<std::unique_ptr<ContentRectangle>>& GetUiElements() const; | 66 const std::vector<std::unique_ptr<ContentRectangle>>& GetUiElements() const; |
67 | 67 |
68 ContentRectangle* GetUiElementById(int element_id); | 68 ContentRectangle* GetUiElementById(int element_id); |
69 | 69 |
70 ContentRectangle* GetContentQuad(); | 70 ContentRectangle* GetContentQuad(); |
71 | 71 |
72 private: | 72 private: |
73 void ApplyRecursiveTransforms(const ContentRectangle& element, | 73 void ApplyRecursiveTransforms(const ContentRectangle& element, |
74 ReversibleTransform* transform); | 74 ReversibleTransform* transform, |
75 float *opacity); | |
mthiesse
2017/01/11 18:33:04
nit: float*
cjgrant
2017/01/11 18:53:07
Life would be boring if I stopped messing this up.
cjgrant
2017/01/11 20:58:42
Done.
| |
75 void ApplyDictToElement(const base::DictionaryValue& dict, | 76 void ApplyDictToElement(const base::DictionaryValue& dict, |
76 ContentRectangle *element); | 77 ContentRectangle *element); |
77 | 78 |
78 std::vector<std::unique_ptr<ContentRectangle>> ui_elements_; | 79 std::vector<std::unique_ptr<ContentRectangle>> ui_elements_; |
79 ContentRectangle* content_element_ = nullptr; | 80 ContentRectangle* content_element_ = nullptr; |
80 | 81 |
81 DISALLOW_COPY_AND_ASSIGN(UiScene); | 82 DISALLOW_COPY_AND_ASSIGN(UiScene); |
82 }; | 83 }; |
83 | 84 |
84 } // namespace vr_shell | 85 } // namespace vr_shell |
85 | 86 |
86 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ | 87 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_H_ |
OLD | NEW |