Rendering text on insecure-site warnings for WebVR

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//device/vr/features.gni")
 import("//testing/test.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 
 if (is_android) {
@@ skipping 237 matching lines @@
     "//ui/gfx/codec",
     "//ui/gfx/geometry",
     "//ui/gfx/range",
   ]
   deps = [
     ":gfx_export",
     "//base",
     "//base:base_static",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
+    "//device/vr:features",

[sadrul, 2017/04/21 22:31:47]

Actually, can you move this down, in (is_android && enable_vr) block?

[acondor_, 2017/04/24 14:28:21]

"features" is a header that defines ENABLE_VR, so it is in fact needed in all
platforms.

[sadrul, 2017/04/24 14:31:49]

I see. Maybe that header could move into an OS_ANDROID check?

Do you know whether/when we plan on supporting |enable_vr| on non-android
platforms? If it is on the plans, then this is ok. If not, some of the following
could also be simplified (e.g. 'is_android && enable_vr' could just be
'enable_vr')

     "//skia",
     "//third_party/zlib",
   ]
 
   # Text rendering conditions (complicated so separated out).
-  if (use_aura || is_mac) {
+  if (use_aura || is_mac || (is_android && enable_vr)) {
     # Mac doesn't use RenderTextHarfBuzz by default yet.
     sources += [
       "harfbuzz_font_skia.cc",
       "harfbuzz_font_skia.h",
       "render_text_harfbuzz.cc",
       "render_text_harfbuzz.h",
       "render_text_mac.h",
       "render_text_mac.mm",
       "text_utils_skia.cc",
     ]
 
     if (!is_ios) {
       sources += [
         "render_text.cc",
         "render_text.h",
       ]
     }
   } else {
     # We don't support RenderText on these platforms.
   }
 
-  if (is_android && use_aura) {
+  if (is_android && enable_vr) {
     sources -= [
       "platform_font_android.cc",
       "text_utils_android.cc",
     ]
     set_sources_assignment_filter([])
     sources += [ "platform_font_linux.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
   # iOS.
   if (is_ios) {
     set_sources_assignment_filter([])
     sources += [ "scoped_cg_context_save_gstate_mac.h" ]
     set_sources_assignment_filter(sources_assignment_filter)
   } else {
     deps += [
       "//cc/paint",
       "//third_party/harfbuzz-ng",
     ]
   }
 
   # Android.
   if (is_android) {
-    if (use_aura) {
+    if (enable_vr) {
       sources -= [ "canvas_notimplemented.cc" ]
       sources += [ "font_fallback_android.cc" ]
     } else {
       sources -= [
         "canvas_skia.cc",
         "path.cc",
         "selection_model.cc",
       ]
     }
 
@@ skipping 443 matching lines @@
 
 fuzzer_test("color_transform_fuzztest") {
   sources = [
     "color_transform_fuzzer.cc",
   ]
   deps = [
     ":gfx",
   ]
   libfuzzer_options = [ "max_len=1024" ]
 }