Rendering text on insecure-site warnings for WebVR

ui/gfx/BUILD.gn

Index: ui/gfx/BUILD.gn
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 595f3d021985175a377bea39585c8da36d26d8a8..02278aea2e7750cf52ce4f46fe2c942c787fdff1 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -260,7 +260,7 @@ component("gfx") {
   ]
 
   # Text rendering conditions (complicated so separated out).
-  if (use_aura || is_mac) {
+  if (use_aura || is_mac || (is_android && enable_vr)) {

[sadrul, 2017/04/13 14:57:55]

I think you can just do 'enable_vr' instead of 'is_android && enable_vr', right?

[acondor_, 2017/04/18 20:59:04]

Acknowledged.

     # Mac doesn't use RenderTextHarfBuzz by default yet.
     sources += [
       "harfbuzz_font_skia.cc",
@@ -282,7 +282,7 @@ component("gfx") {
     # We don't support RenderText on these platforms.
   }
 
-  if (is_android && use_aura) {
+  if (is_android && (use_aura || enable_vr)) {

[sadrul, 2017/04/13 14:57:55]

As mthiesse@ suggested, you can get rid of the use_aura check here and below
(~309)

[acondor_, 2017/04/18 20:59:04]

Done.

     sources -= [
       "platform_font_android.cc",
       "text_utils_android.cc",
@@ -306,7 +306,7 @@ component("gfx") {
 
   # Android.
   if (is_android) {
-    if (use_aura) {
+    if (use_aura || enable_vr) {
       sources -= [ "canvas_notimplemented.cc" ]
       sources += [ "font_fallback_android.cc" ]
     } else {