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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 2006923006: Move all CARendererLayerTree parameters to separate struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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 | gpu/ipc/service/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 653e05e6ab7ad27eb4a685d20bad26e1091930b9..9ccd96b28191fa6e6c008fcf22fd7c772df4dac6 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -68,10 +68,12 @@
#include "ui/gfx/buffer_types.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gfx/overlay_transform.h"
#include "ui/gfx/transform.h"
+#include "ui/gl/ca_renderer_layer_params.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_fence.h"
@@ -10699,10 +10701,13 @@ error::Error GLES2DecoderImpl::HandleScheduleCALayerCHROMIUM(
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, c.edge_aa_mask,
- bounds_rect, c.is_clipped ? true : false, clip_rect, transform,
- c.sorting_context_id, filter)) {
+
+ ui::CARendererLayerParams params = ui::CARendererLayerParams(
+ c.is_clipped ? true : false, gfx::ToEnclosingRect(clip_rect),
Nico 2016/07/01 15:24:31 why `? true : false`?
+ c.sorting_context_id, transform, image, contents_rect,
+ gfx::ToEnclosingRect(bounds_rect), c.background_color, c.edge_aa_mask,
+ c.opacity, filter);
+ if (!surface_->ScheduleCALayer(params)) {
LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
"failed to schedule CALayer");
}
« no previous file with comments | « no previous file | gpu/ipc/service/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698