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

Unified Diff: cc/output/gl_renderer.cc

Issue 1534623002: Mac CoreAnimation: Add more CALayer parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows compile Created 5 years 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 | content/common/gpu/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index f0ea96c1e0bc77904afc00f8593f0966f954d133..32d1542ebde36417980143e01fbbd6266f29e3af 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -3542,15 +3542,22 @@ void GLRenderer::ScheduleCALayers(DrawingFrame* frame) {
ca_layer_overlay.contents_rect.width(),
ca_layer_overlay.contents_rect.height(),
};
- GLfloat bounds_size[2] = {
- ca_layer_overlay.bounds_size.width(),
+ GLuint edge_aa_mask = 0;
+ GLfloat bounds_rect[4] = {
+ 0, 0, ca_layer_overlay.bounds_size.width(),
ca_layer_overlay.bounds_size.height(),
};
+ GLboolean is_clipped = GL_FALSE;
+ GLfloat clip_rect[4] = {
+ 0, 0, 0, 0,
+ };
+ GLint sorting_context_id = 0;
GLfloat transform[16];
ca_layer_overlay.transform.asColMajorf(transform);
gl_->ScheduleCALayerCHROMIUM(
texture_id, contents_rect, ca_layer_overlay.opacity,
- ca_layer_overlay.background_color, bounds_size, transform);
+ ca_layer_overlay.background_color, edge_aa_mask, bounds_rect,
+ is_clipped, clip_rect, sorting_context_id, transform);
}
}
« no previous file with comments | « no previous file | content/common/gpu/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698