VR: Loading DD controller model after GL is initialized

chrome/browser/android/vr_shell/vr_controller_model.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace vr_shell {
 
@@ skipping 116 matching lines @@
 
 const gltf::Accessor* VrControllerModel::Accessor(
     const std::string& key) const {
   const gltf::Mesh* mesh = gltf_asset_->GetMesh(0);
   DCHECK(mesh && mesh->primitives.size());
   auto it = mesh->primitives[0]->attributes.find(key);
   DCHECK(it != mesh->primitives[0]->attributes.begin());
   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);
   std::unique_ptr<gltf::Asset> asset =
       BinaryGltfParser::Parse(model_data, &buffers);
   DCHECK(asset);
 
   auto controller_model =
       base::MakeUnique<VrControllerModel>(std::move(asset), std::move(buffers));
   sk_sp<SkImage> base_texture = LoadPng(IDR_VR_SHELL_DDCONTROLLER_IDLE_TEXTURE);
   controller_model->SetBaseTexture(std::move(base_texture));
 
   for (int i = 0; i < VrControllerModel::STATE_COUNT; i++) {
     if (kTexturePatchesResources[i] == -1)
       continue;
     auto patch_image = LoadPng(kTexturePatchesResources[i]);
     controller_model->SetTexturePatch(i, patch_image);
   }
 
   return controller_model;
 }
 
 }  // namespace vr_shell