Hook up insecure content warnings for http webVR presentation.

chrome/browser/android/vr_shell/vr_shell_gl.cc

 // Copyright 2016 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/vr_shell_gl.h"
 
 #include <chrono>
 #include <limits>
 #include <utility>
 
@@ skipping 276 matching lines @@
   CreateContentSurface();
   content_surface_texture_->SetFrameAvailableCallback(base::Bind(
       &VrShellGl::OnContentFrameAvailable, weak_ptr_factory_.GetWeakPtr()));
   webvr_surface_texture_->SetFrameAvailableCallback(base::Bind(
       &VrShellGl::OnWebVRFrameAvailable, weak_ptr_factory_.GetWeakPtr()));
   content_surface_texture_->SetDefaultBufferSize(
       content_tex_physical_size_.width(), content_tex_physical_size_.height());
 
   InitializeRenderer();
 
+  scene_->OnGLInitialized();

[cjgrant, 2017/04/21 14:30:13]

So just my opinion here, but I really don't like that scene needs this, and by
proxy, that elements need separate construct and initialize steps.  I think this
would be much cleaner if:
- Only the scene manager is aware of GL-isms (which is clear since it needs to
construct GL-based elements).
- The scene stays unaware of element details, and focuses on scene graph type
stuff.
- VrShellGl's constructor accepted a callback parameter, OnGlInitiaized.
- The GL thread binds a callback to SceneManager::OnGlInitialized() and gives it
to the GL thread.  It could use this for other things in the future if needed.
- Scene manager creates all elements when that callback fires; the scene doesn't
know about GL, and elements are created in one step.

[mthiesse, 2017/04/21 15:05:12]

Agreed, but I avoided doing that for now because this is simpler in the short
term. We should fix this in a followup we don't merge back to M59.

[cjgrant, 2017/04/21 15:19:33]

Mind making a (single or separate) bug for renderer flush cleanup and GL init
cleanup?

+
   gfx::Size webvr_size =
       device::GvrDelegate::GetRecommendedWebVrSize(gvr_api_.get());
   DVLOG(1) << __FUNCTION__ << ": resize initial to " << webvr_size.width()
            << "x" << webvr_size.height();
 
   CreateOrResizeWebVRSurface(webvr_size);
 
   vsync_task_.Reset(base::Bind(&VrShellGl::OnVSync, base::Unretained(this)));
   OnVSync();
 
@@ skipping 680 matching lines @@
   }
 }
 
 void VrShellGl::DrawElements(const vr::Mat4f& view_proj_matrix,
                              const std::vector<const UiElement*>& elements) {
   for (const auto* rect : elements) {
     vr::Mat4f transform;
     vr::MatrixMul(view_proj_matrix, rect->TransformMatrix(), &transform);
 
     switch (rect->fill) {
-      case Fill::SKIA: {
-        break;
-      }
       case Fill::OPAQUE_GRADIENT: {
-        vr_shell_renderer_->GetTexturedQuadRenderer()->Flush();
         vr_shell_renderer_->GetGradientQuadRenderer()->Draw(
             transform, rect->edge_color, rect->center_color,
             rect->computed_opacity);
         break;
       }
       case Fill::GRID_GRADIENT: {
-        vr_shell_renderer_->GetTexturedQuadRenderer()->Flush();
         vr_shell_renderer_->GetGradientGridRenderer()->Draw(
             transform, rect->edge_color, rect->center_color,
             rect->gridline_count, rect->computed_opacity);
         break;
       }
       case Fill::CONTENT: {
         gfx::RectF copy_rect(0, 0, 1, 1);
-        vr_shell_renderer_->GetTexturedQuadRenderer()->AddQuad(
+        vr_shell_renderer_->GetTexturedQuadRenderer()->Draw(
             content_texture_id_, transform, copy_rect, rect->computed_opacity);
         break;
       }
+      case Fill::SELF: {
+        rect->Render(vr_shell_renderer_.get(), transform);
+        break;
+      }
       default:
         break;
     }
   }
-
-  vr_shell_renderer_->GetTexturedQuadRenderer()->Flush();
+  vr_shell_renderer_->GetSkiaQuadRenderer()->Flush();

[cjgrant, 2017/04/21 14:30:13]

This isn't healthy IMO.  Longer-term, vr_shell_renderer_->Flush() would be
better.  It ought to be aware of what it's renderers are up to under the hood,
rather than this module.

[mthiesse, 2017/04/21 15:05:12]

Changed to vr_shell_renderer_->Flush(); for now. Longer term we need some larger
refactoring here.

 }
 
 std::vector<const UiElement*> VrShellGl::GetElementsInDrawOrder(
     const vr::Mat4f& view_matrix,
     const std::vector<const UiElement*>& elements) {
   typedef std::pair<float, const UiElement*> DistanceElementPair;
   std::vector<DistanceElementPair> zOrderedElementPairs;
   zOrderedElementPairs.reserve(elements.size());
 
   for (const auto* element : elements) {
@@ skipping 289 matching lines @@
   // InitializeGl. Revisit if the initialization order changes.
   device::mojom::VRDisplayInfoPtr info =
       device::GvrDelegate::CreateVRDisplayInfo(gvr_api_.get(),
                                                webvr_surface_size_, device_id);
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&RunVRDisplayInfoCallback, callback, base::Passed(&info)));
 }
 
 }  // namespace vr_shell