| Index: services/ui/ws/frame_generator.cc
 | 
| diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
 | 
| index 702818d2ef5e952413533e9b9d320e09d67a3499..8bec161d4668d69145680bde8ce5033cad8438c9 100644
 | 
| --- a/services/ui/ws/frame_generator.cc
 | 
| +++ b/services/ui/ws/frame_generator.cc
 | 
| @@ -123,7 +123,7 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
 | 
|      cc::SharedQuadState* shared_state =
 | 
|          invert_pass->CreateAndAppendSharedQuadState();
 | 
|      shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
 | 
| -                         output_rect, false, 1.f, SkXfermode::kSrcOver_Mode, 0);
 | 
| +                         output_rect, false, 1.f, SkBlendMode::kSrcOver, 0);
 | 
|      auto* quad = invert_pass->CreateAndAppendDrawQuad<cc::RenderPassDrawQuad>();
 | 
|      cc::FilterOperations filters;
 | 
|      filters.Append(cc::FilterOperation::CreateInvertFilter(1.f));
 | 
| @@ -182,12 +182,11 @@ void FrameGenerator::DrawWindowTree(
 | 
|      const gfx::Rect bounds_at_origin(window->bounds().size());
 | 
|      // TODO(fsamuel): These clipping and visible rects are incorrect. They need
 | 
|      // to be populated from CompositorFrame structs.
 | 
| -    sqs->SetAll(quad_to_target_transform,
 | 
| -                bounds_at_origin.size() /* layer_bounds */,
 | 
| -                bounds_at_origin /* visible_layer_bounds */,
 | 
| -                bounds_at_origin /* clip_rect */, false /* is_clipped */,
 | 
| -                combined_opacity, SkXfermode::kSrcOver_Mode,
 | 
| -                0 /* sorting-context_id */);
 | 
| +    sqs->SetAll(
 | 
| +        quad_to_target_transform, bounds_at_origin.size() /* layer_bounds */,
 | 
| +        bounds_at_origin /* visible_layer_bounds */,
 | 
| +        bounds_at_origin /* clip_rect */, false /* is_clipped */,
 | 
| +        combined_opacity, SkBlendMode::kSrcOver, 0 /* sorting-context_id */);
 | 
|      auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
 | 
|      AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType::DEFAULT,
 | 
|                                  window);
 | 
| @@ -206,12 +205,11 @@ void FrameGenerator::DrawWindowTree(
 | 
|      const gfx::Rect bounds_at_origin(
 | 
|          window->compositor_frame_sink_manager()->GetLatestFrameSize(
 | 
|              mojom::CompositorFrameSinkType::UNDERLAY));
 | 
| -    sqs->SetAll(quad_to_target_transform,
 | 
| -                bounds_at_origin.size() /* layer_bounds */,
 | 
| -                bounds_at_origin /* visible_layer_bounds */,
 | 
| -                bounds_at_origin /* clip_rect */, false /* is_clipped */,
 | 
| -                combined_opacity, SkXfermode::kSrcOver_Mode,
 | 
| -                0 /* sorting-context_id */);
 | 
| +    sqs->SetAll(
 | 
| +        quad_to_target_transform, bounds_at_origin.size() /* layer_bounds */,
 | 
| +        bounds_at_origin /* visible_layer_bounds */,
 | 
| +        bounds_at_origin /* clip_rect */, false /* is_clipped */,
 | 
| +        combined_opacity, SkBlendMode::kSrcOver, 0 /* sorting-context_id */);
 | 
|  
 | 
|      auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
 | 
|      AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType::UNDERLAY,
 | 
| 
 |