Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1025)

Unified Diff: components/mus/ws/platform_display.cc

Issue 1919673005: Fix mash chrome crashing when hovering over link. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix another instance. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/platform_display.cc
diff --git a/components/mus/ws/platform_display.cc b/components/mus/ws/platform_display.cc
index 55de1b771771917a094d806c94bc8c95d54e09e4..116d1f32b2675ad790adb9f9edcdeab1eadd1ab3 100644
--- a/components/mus/ws/platform_display.cc
+++ b/components/mus/ws/platform_display.cc
@@ -114,11 +114,12 @@ void DrawWindowTree(cc::RenderPass* pass,
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 */,
- window->opacity(), SkXfermode::kSrc_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 */,
+ window->opacity(), SkXfermode::kSrcOver_Mode,
+ 0 /* sorting-context_id */);
auto quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
quad->SetAll(sqs, bounds_at_origin /* rect */,
gfx::Rect() /* opaque_rect */,
@@ -134,11 +135,12 @@ void DrawWindowTree(cc::RenderPass* pass,
cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
const gfx::Rect bounds_at_origin(
underlay_surface->last_submitted_frame_size());
- 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 */,
- window->opacity(), SkXfermode::kSrc_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 */,
+ window->opacity(), SkXfermode::kSrcOver_Mode,
+ 0 /* sorting-context_id */);
auto quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
quad->SetAll(sqs, bounds_at_origin /* rect */,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698