| Index: chrome/browser/android/vr_shell/vr_controller_model.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_controller_model.h b/chrome/browser/android/vr_shell/vr_controller_model.h
|
| index b679ea4d86c16b5c10f33083394a477ce20aa170..6bf81d7ea165e788a626f9c0ce0e478993f75a0c 100644
|
| --- a/chrome/browser/android/vr_shell/vr_controller_model.h
|
| +++ b/chrome/browser/android/vr_shell/vr_controller_model.h
|
| @@ -39,15 +39,15 @@ class VrControllerModel {
|
| const gltf::Accessor* PositionAccessor() const;
|
| const gltf::Accessor* TextureCoordinateAccessor() const;
|
| void SetBaseTexture(sk_sp<SkImage> image);
|
| - void SetTexturePatch(int state, sk_sp<SkImage> image);
|
| + void SetTexture(int state, sk_sp<SkImage> patch);
|
| sk_sp<SkImage> GetTexture(int state) const;
|
|
|
| - static std::unique_ptr<VrControllerModel> LoadFromComponent();
|
| + static std::unique_ptr<VrControllerModel> LoadFromResources();
|
|
|
| private:
|
| std::unique_ptr<gltf::Asset> gltf_asset_;
|
| sk_sp<SkImage> base_texture_;
|
| - sk_sp<SkImage> patches_[STATE_COUNT];
|
| + sk_sp<SkImage> textures_[STATE_COUNT];
|
| std::vector<std::unique_ptr<gltf::Buffer>> buffers_;
|
|
|
| const char* Buffer() const;
|
|
|