[mus]Add FrameGenerator::SetHighContrastMode(bool)

services/ui/ws/frame_generator.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 "services/ui/ws/frame_generator.h"
 
 #include <utility>
 #include <vector>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
-#include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/server_window.h"
 
 namespace ui {
 
 namespace ws {
 
 FrameGenerator::FrameGenerator(
-    FrameGeneratorDelegate* delegate,
     ServerWindow* root_window,
     std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink)
-    : delegate_(delegate),
-      root_window_(root_window),
+    : root_window_(root_window),
       compositor_frame_sink_(std::move(compositor_frame_sink)) {
-  DCHECK(delegate_);
   compositor_frame_sink_->BindToClient(this);
 }
 
 FrameGenerator::~FrameGenerator() {
   compositor_frame_sink_->DetachFromClient();
 }
 
 void FrameGenerator::SetDeviceScaleFactor(float device_scale_factor) {
   if (device_scale_factor_ == device_scale_factor)
     return;
   device_scale_factor_ = device_scale_factor;
   if (window_manager_surface_info_.is_valid())
     SetNeedsBeginFrame(true);
 }
 
+void FrameGenerator::SetHighContrastMode(bool enabled) {
+  if (high_contrast_mode_enabled_ == enabled)
+    return;
+
+  high_contrast_mode_enabled_ = enabled;
+  if (window_manager_surface_info_.is_valid())
+    SetNeedsBeginFrame(true);
+}
+
 void FrameGenerator::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   DCHECK(surface_info.is_valid());
 
   // Only handle embedded surfaces changing here. The display root surface
   // changing is handled immediately after the CompositorFrame is submitted.
   if (surface_info != window_manager_surface_info_) {
     window_manager_surface_info_ = surface_info;
     SetNeedsBeginFrame(true);
   }
 }
@@ skipping 60 matching lines @@
     const gfx::Rect& output_rect) {
   const int render_pass_id = 1;
   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
   render_pass->SetNew(render_pass_id, output_rect, output_rect,
                       gfx::Transform());
 
   DrawWindow(render_pass.get());
 
   cc::CompositorFrame frame;
   frame.render_pass_list.push_back(std::move(render_pass));
-  if (delegate_->IsInHighContrastMode()) {
+  if (high_contrast_mode_enabled_) {
     std::unique_ptr<cc::RenderPass> invert_pass = cc::RenderPass::Create();
     invert_pass->SetNew(2, output_rect, output_rect, gfx::Transform());
     cc::SharedQuadState* shared_state =
         invert_pass->CreateAndAppendSharedQuadState();
     gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(
         output_rect.size(), window_manager_surface_info_.device_scale_factor(),
         window_manager_surface_info_.device_scale_factor());
     shared_state->SetAll(gfx::Transform(), scaled_bounds, output_rect,
                          output_rect, false, 1.f, SkBlendMode::kSrcOver, 0);
     auto* quad = invert_pass->CreateAndAppendDrawQuad<cc::RenderPassDrawQuad>();
-    render_pass->filters.Append(cc::FilterOperation::CreateInvertFilter(1.f));
+    frame.render_pass_list.back()->filters.Append(

[msw, 2017/03/20 23:55:26]

q: why not continue using |render_pass| here?

[Alex Z., 2017/03/21 15:30:53]

render_pass is moved on line 130.

+        cc::FilterOperation::CreateInvertFilter(1.f));
     quad->SetNew(shared_state, output_rect, output_rect, render_pass_id,
                  0 /* mask_resource_id */, gfx::RectF() /* mask_uv_rect */,
                  gfx::Size() /* mask_texture_size */,
                  gfx::Vector2dF() /* filters_scale */,
                  gfx::PointF() /* filters_origin */,
                  gfx::RectF() /* tex_coord_rect */);
     frame.render_pass_list.push_back(std::move(invert_pass));
   }
   frame.metadata.device_scale_factor = device_scale_factor_;
 
@@ skipping 43 matching lines @@
   observing_begin_frames_ = needs_begin_frame;
   if (needs_begin_frame)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace ws
 
 }  // namespace ui