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

Side by Side Diff: cc/test/pixel_test.cc

Issue 2693723002: cc: Move output color space from DrawingFrame to RenderPass (Closed)
Patch Set: Fix typo Created 3 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/pixel_test.h" 5 #include "cc/test/pixel_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 request->set_area(*copy_rect); 75 request->set_area(*copy_rect);
76 target->copy_requests.push_back(std::move(request)); 76 target->copy_requests.push_back(std::move(request));
77 77
78 if (software_renderer_) { 78 if (software_renderer_) {
79 software_renderer_->SetDisablePictureQuadImageFiltering( 79 software_renderer_->SetDisablePictureQuadImageFiltering(
80 disable_picture_quad_image_filtering_); 80 disable_picture_quad_image_filtering_);
81 } 81 }
82 82
83 renderer_->DecideRenderPassAllocationsForFrame(*pass_list); 83 renderer_->DecideRenderPassAllocationsForFrame(*pass_list);
84 float device_scale_factor = 1.f; 84 float device_scale_factor = 1.f;
85 renderer_->DrawFrame(pass_list, device_scale_factor, gfx::ColorSpace(), 85 renderer_->DrawFrame(pass_list, device_scale_factor, device_viewport_size_);
86 device_viewport_size_);
87 86
88 // Wait for the readback to complete. 87 // Wait for the readback to complete.
89 if (output_surface_->context_provider()) 88 if (output_surface_->context_provider())
90 output_surface_->context_provider()->ContextGL()->Finish(); 89 output_surface_->context_provider()->ContextGL()->Finish();
91 run_loop.Run(); 90 run_loop.Run();
92 91
93 return PixelsMatchReference(ref_file, comparator); 92 return PixelsMatchReference(ref_file, comparator);
94 } 93 }
95 94
96 void PixelTest::ReadbackResult(base::Closure quit_run_loop, 95 void PixelTest::ReadbackResult(base::Closure quit_run_loop,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 auto renderer = base::MakeUnique<SoftwareRenderer>( 169 auto renderer = base::MakeUnique<SoftwareRenderer>(
171 &settings_.renderer_settings, output_surface_.get(), 170 &settings_.renderer_settings, output_surface_.get(),
172 resource_provider_.get()); 171 resource_provider_.get());
173 software_renderer_ = renderer.get(); 172 software_renderer_ = renderer.get();
174 renderer_ = std::move(renderer); 173 renderer_ = std::move(renderer);
175 renderer_->Initialize(); 174 renderer_->Initialize();
176 renderer_->SetVisible(true); 175 renderer_->SetVisible(true);
177 } 176 }
178 177
179 } // namespace cc 178 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698