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

Side by Side Diff: cc/surfaces/surface_aggregator.cc

Issue 2804953008: cc: Make surface aggregator convert surface quad to RPDQ correctly (Closed)
Patch Set: Revert "Add unit test." Created 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/surfaces/surface_aggregator.h" 5 #include "cc/surfaces/surface_aggregator.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 int remapped_pass_id = RemapPassId(last_pass.id, surface_id); 326 int remapped_pass_id = RemapPassId(last_pass.id, surface_id);
327 327
328 SharedQuadState* shared_quad_state = 328 SharedQuadState* shared_quad_state =
329 CopySharedQuadState(surface_quad->shared_quad_state, target_transform, 329 CopySharedQuadState(surface_quad->shared_quad_state, target_transform,
330 clip_rect, dest_pass); 330 clip_rect, dest_pass);
331 331
332 RenderPassDrawQuad* quad = 332 RenderPassDrawQuad* quad =
333 dest_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); 333 dest_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
334 quad->SetNew(shared_quad_state, surface_quad->rect, 334 quad->SetNew(shared_quad_state, surface_quad->rect,
335 surface_quad->visible_rect, remapped_pass_id, 0, gfx::RectF(), 335 surface_quad->visible_rect, remapped_pass_id, 0, gfx::RectF(),
336 gfx::Size(), gfx::Vector2dF(), gfx::PointF(), gfx::RectF()); 336 gfx::Size(), gfx::Vector2dF(), gfx::PointF(),
337 gfx::RectF(surface_quad->rect));
337 } 338 }
338 339
339 referenced_surfaces_.erase(it); 340 referenced_surfaces_.erase(it);
340 } 341 }
341 342
342 void SurfaceAggregator::AddColorConversionPass() { 343 void SurfaceAggregator::AddColorConversionPass() {
343 if (dest_pass_list_->empty()) 344 if (dest_pass_list_->empty())
344 return; 345 return;
345 346
346 RenderPass* root_render_pass = dest_pass_list_->back().get(); 347 RenderPass* root_render_pass = dest_pass_list_->back().get();
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 } 929 }
929 930
930 void SurfaceAggregator::SetOutputColorSpace( 931 void SurfaceAggregator::SetOutputColorSpace(
931 const gfx::ColorSpace& blending_color_space, 932 const gfx::ColorSpace& blending_color_space,
932 const gfx::ColorSpace& output_color_space) { 933 const gfx::ColorSpace& output_color_space) {
933 blending_color_space_ = blending_color_space; 934 blending_color_space_ = blending_color_space;
934 output_color_space_ = output_color_space; 935 output_color_space_ = output_color_space;
935 } 936 }
936 937
937 } // namespace cc 938 } // namespace cc
OLDNEW
« 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