[vr] Bail on unhandled code points.

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 66 matching lines @@
       return kWarningIconColor;
   }
 }
 
 gfx::PointF percentToMeters(const gfx::PointF& percent) {
   return gfx::PointF(percent.x() * kWidth, percent.y() * kHeight);
 }
 
 }  // namespace
 
-UrlBarTexture::UrlBarTexture() : security_level_(SecurityLevel::DANGEROUS) {}
+UrlBarTexture::UrlBarTexture(
+    const base::Callback<void(UiUnsupportedMode)>& failure_callback)
+    : security_level_(SecurityLevel::DANGEROUS),
+      failure_callback_(failure_callback) {}
 
 UrlBarTexture::~UrlBarTexture() = default;
 
 void UrlBarTexture::SetURL(const GURL& gurl) {
   if (gurl_ != gurl)
     set_dirty();
   gurl_ = gurl;
 }
 
 void UrlBarTexture::SetSecurityLevel(int level) {
@@ skipping 105 matching lines @@
 
   if (!gurl_.is_empty()) {
     if (last_drawn_gurl_ != gurl_) {
       // Draw text based on pixel sizes rather than meters, for correct font
       // sizing.
       int pixel_font_height = texture_size.height() * kFontHeight / kHeight;
       float url_x = kBackButtonWidth + kSeparatorWidth + kSecurityFieldWidth;
       float url_width = kWidth - url_x - kUrlRightMargin;
       gfx::Rect text_bounds(ToPixels(url_x), 0, ToPixels(url_width),
                             ToPixels(kHeight));
+      base::string16 text = base::UTF8ToUTF16(gurl_.spec());
+      if (!CheckFontList(pixel_font_height, text))
+        failure_callback_.Run(UiUnsupportedMode::kUnhandledCodePoint);
       gurl_render_texts_ = PrepareDrawStringRect(

[cjgrant, 2017/05/26 18:52:00]

This needs some non-trivial rebasing, as we don't touch gurl_.spec() anymore. 
The check should be moved to after the new FormatURL call, which returns the
string16 we'll render.

[Ian Vollick, 2017/05/26 20:20:28]

Done. Also, since we're now using GetFontList, I was able to modify that
function instead and get rid of CheckFontList.

-          base::UTF8ToUTF16(gurl_.spec()),
-          GetDefaultFontList(pixel_font_height), SK_ColorBLACK, &text_bounds,
-          kTextAlignmentLeft, kWrappingBehaviorNoWrap);
+          text, GetDefaultFontList(pixel_font_height), SK_ColorBLACK,
+          &text_bounds, kTextAlignmentLeft, kWrappingBehaviorNoWrap);
       last_drawn_gurl_ = gurl_;
     }
     for (auto& render_text : gurl_render_texts_)
       render_text->Draw(&gfx_canvas);
   }
 }
 
 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