VR: System indicator rework.

chrome/browser/android/vr_shell/ui_elements/textured_element.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/ui_elements/textured_element.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/paint/skia_paint_canvas.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
 #include "chrome/browser/android/vr_shell/ui_element_renderer.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace vr_shell {
 
 TexturedElement::TexturedElement(int maximum_width)
     : texture_handle_(-1), maximum_width_(maximum_width) {}
 
 TexturedElement::~TexturedElement() = default;
 
 void TexturedElement::Initialize() {
   TRACE_EVENT0("gpu", "TexturedElement::Initialize");
   glGenTextures(1, &texture_handle_);
   DCHECK(GetTexture() != nullptr);
   texture_size_ = GetTexture()->GetPreferredTextureSize(maximum_width_);
   initialized_ = true;
   UpdateTexture();
   set_fill(Fill::SELF);
-  gfx::SizeF drawn_size = GetTexture()->GetDrawnSize();
-  float y = drawn_size.height() / drawn_size.width() * size().x();
-  set_size({size().x(), y, 1});
 }
 
 void TexturedElement::UpdateTexture() {
   if (!initialized_ || !GetTexture()->dirty())
     return;
   sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(
       texture_size_.width(), texture_size_.height());
   GetTexture()->DrawAndLayout(surface->getCanvas(), texture_size_);
   Flush(surface.get());
+  // Update the element size's aspect ratio to match the texture.
+  UpdateElementSize();
+}
+
+void TexturedElement::UpdateElementSize() {
+  // Updating the height according to width is a hack.  This may be overridden.
+  gfx::SizeF drawn_size = GetTexture()->GetDrawnSize();
+  float y = drawn_size.height() / drawn_size.width() * size().x();
+  set_size({size().x(), y, 1});
 }
 
 void TexturedElement::Render(UiElementRenderer* renderer,
                              gfx::Transform view_proj_matrix) const {
   if (!initialized_)
     return;
   gfx::SizeF drawn_size = GetTexture()->GetDrawnSize();
   gfx::RectF copy_rect(0, 0, drawn_size.width() / texture_size_.width(),
                        drawn_size.height() / texture_size_.height());
   renderer->DrawTexturedQuad(texture_handle_, view_proj_matrix, copy_rect,
@@ skipping 14 matching lines @@
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixmap.width(), pixmap.height(), 0,
                GL_RGBA, GL_UNSIGNED_BYTE, pixmap.addr());
 }
 
 void TexturedElement::OnSetMode() {
   GetTexture()->SetMode(mode());
   UpdateTexture();
 }
 
 }  // namespace vr_shell