| Index: chrome/browser/android/vr_shell/vr_controller_model.cc
|
| diff --git a/chrome/browser/android/vr_shell/vr_controller_model.cc b/chrome/browser/android/vr_shell/vr_controller_model.cc
|
| index 7dc30dbf098d25edaef19be3ab5f5827722d5e14..a64345431298d3383b625ad2c20506fee6603122 100644
|
| --- a/chrome/browser/android/vr_shell/vr_controller_model.cc
|
| +++ b/chrome/browser/android/vr_shell/vr_controller_model.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/android/vr_shell/vr_controller_model.h"
|
|
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/trace_event/trace_event.h"
|
| #include "chrome/browser/android/vr_shell/gltf_parser.h"
|
| #include "chrome/grit/browser_resources.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| @@ -141,7 +142,8 @@ const gltf::Accessor* VrControllerModel::Accessor(
|
| return it->second;
|
| }
|
|
|
| -std::unique_ptr<VrControllerModel> VrControllerModel::LoadFromComponent() {
|
| +std::unique_ptr<VrControllerModel> VrControllerModel::LoadFromResources() {
|
| + TRACE_EVENT0("gpu", "VrControllerModel::LoadFromComponent");
|
| std::vector<std::unique_ptr<gltf::Buffer>> buffers;
|
| auto model_data = ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| IDR_VR_SHELL_DDCONTROLLER_MODEL);
|
|
|