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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.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
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index e8bbe5885459434f3dff96c195f981ae1b6ee30d..81f3761223bf5371d77cb3c5125de11cf93ab1af 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -9618,18 +9618,21 @@ error::Error GLES2DecoderImpl::HandleScheduleCALayerCHROMIUM(
}
const GLfloat* mem = GetSharedMemoryAs<const GLfloat*>(c.shm_id, c.shm_offset,
- 22 * sizeof(GLfloat));
+ 28 * sizeof(GLfloat));
if (!mem) {
return error::kOutOfBounds;
}
gfx::RectF contents_rect(mem[0], mem[1], mem[2], mem[3]);
- gfx::SizeF bounds_size(mem[4], mem[5]);
- gfx::Transform transform(mem[6], mem[10], mem[14], mem[18],
- mem[7], mem[11], mem[15], mem[19],
- mem[8], mem[12], mem[16], mem[20],
- mem[9], mem[13], mem[17], mem[21]);
+ gfx::RectF bounds_rect(mem[4], mem[5], mem[6], mem[7]);
+ gfx::RectF clip_rect(mem[8], mem[9], mem[10], mem[11]);
+ gfx::Transform transform(mem[12], mem[16], mem[20], mem[24],
+ mem[13], mem[17], mem[21], mem[25],
+ mem[14], mem[18], mem[22], mem[26],
+ mem[15], mem[19], mem[23], mem[27]);
if (!surface_->ScheduleCALayer(image, contents_rect, c.opacity,
- c.background_color, bounds_size, transform)) {
+ c.background_color, c.edge_aa_mask,
+ bounds_rect, c.is_clipped ? true : false,
+ clip_rect, transform)) {
LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
"failed to schedule CALayer");
}
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | mojo/gpu/mojo_gles2_impl_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698