Refactor VR Shell Input. Locks input to click/scroll targets.

chrome/browser/android/vr_shell/textures/url_bar_texture.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/textures/url_bar_texture.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/skia_paint_canvas.h"
 #include "components/security_state/core/security_state.h"
 #include "ui/gfx/canvas.h"
@@ skipping 45 matching lines @@
       return ui::kWarningIcon;
   }
 }
 
 }  // namespace
 
 UrlBarTexture::UrlBarTexture() : security_level_(SecurityLevel::DANGEROUS) {}
 
 UrlBarTexture::~UrlBarTexture() = default;
 
-void UrlBarTexture::SetHover(bool hover) {
-  hover_ = hover;
-}
-
 void UrlBarTexture::SetURL(const GURL& gurl) {
   gurl_ = gurl;
 }
 
 void UrlBarTexture::SetSecurityLevel(int level) {
   security_level_ = level;
 }
 
 float UrlBarTexture::ToPixels(float meters) const {
   return meters * size_.width() / kWidth;
@@ skipping 11 matching lines @@
   gfx::Canvas gfx_canvas(&paint_canvas, 1.0f);
 
   canvas->drawColor(kTextureBackground);
 
   // Back button area.
   SkRRect round_rect;
   SkVector rounded_corner = {kHeight / 2, kHeight / 2};
   SkVector left_corners[4] = {rounded_corner, {0, 0}, {0, 0}, rounded_corner};
   round_rect.setRectRadii({0, 0, kHeight, kHeight}, left_corners);
   SkPaint paint;
-  paint.setColor(hover_ ? kBackgroundHover : kBackground);
+  paint.setColor((draw_flags_ & FLAG_HOVER) ? kBackgroundHover : kBackground);
   canvas->drawRRect(round_rect, paint);
 
   // URL area.
   paint.setColor(kBackground);
   SkVector right_corners[4] = {{0, 0}, rounded_corner, rounded_corner, {0, 0}};
   round_rect.setRectRadii({kHeight, 0, kWidth, kHeight}, right_corners);
   canvas->drawRRect(round_rect, paint);
 
   // Back button / URL separator vertical line.
   paint.setColor(kSeparatorColor);
@@ skipping 19 matching lines @@
         kHeight / 2);
     canvas->translate(-kSecurityIconHeight / 2, -kSecurityIconHeight / 2);
     const gfx::VectorIcon& security_icon = getSecurityIcon(security_level_);
     icon_default_height = GetDefaultSizeOfVectorIcon(security_icon);
     icon_scale = kSecurityIconHeight / icon_default_height;
     canvas->scale(icon_scale, icon_scale);
     PaintVectorIcon(&gfx_canvas, security_icon, kForeground);
     canvas->restore();
   }
 
-  canvas->restore();

[cjgrant, 2017/05/10 20:16:25]

Why are you removing this?  It removes the scale on line 87.

[mthiesse, 2017/05/10 21:09:08]

Rebasing error, good catch.

-
   // Draw text based on pixel sizes rather than meters, for correct font sizing.
   int pixel_font_height = texture_size.height() * kFontHeight / kHeight;
   int text_flags = gfx::Canvas::TEXT_ALIGN_LEFT;
   float url_x = kBackButtonWidth + kSeparatorWidth + kSecurityFieldWidth;
   float url_width = kWidth - url_x - kUrlRightMargin;
   gfx_canvas.DrawStringRectWithFlags(
       base::UTF8ToUTF16(gurl_.spec()), GetDefaultFontList(pixel_font_height),
       SK_ColorBLACK,
       gfx::Rect(ToPixels(url_x), 0, ToPixels(url_width), ToPixels(kHeight)),
       text_flags);
 }
 
 gfx::Size UrlBarTexture::GetPreferredTextureSize(int maximum_width) const {
   return gfx::Size(maximum_width, maximum_width * kHeight / kWidth);
 }
 
 gfx::SizeF UrlBarTexture::GetDrawnSize() const {
   return size_;
 }
 
 }  // namespace vr_shell