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

Unified Diff: ui/compositor/test/in_process_context_factory.cc

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « gpu/command_buffer/service/query_manager.cc ('k') | ui/compositor/test/in_process_context_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 942947d5b1b020f3ebfcfe21cc7cf2097d2067cb..13ddd907528859088678baa0f3030f96334fb2b1 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -41,11 +41,9 @@
// GL surface.
class DirectOutputSurface : public cc::OutputSurface {
public:
- DirectOutputSurface(
- const scoped_refptr<cc::ContextProvider>& context_provider,
- const scoped_refptr<cc::ContextProvider>& worker_context_provider)
- : cc::OutputSurface(context_provider, worker_context_provider),
- weak_ptr_factory_(this) {}
+ explicit DirectOutputSurface(
+ const scoped_refptr<cc::ContextProvider>& context_provider)
+ : cc::OutputSurface(context_provider), weak_ptr_factory_(this) {}
~DirectOutputSurface() override {}
@@ -112,19 +110,16 @@
InProcessContextProvider::Create(attribs, &gpu_memory_buffer_manager_,
&image_factory_,
compositor->widget(), "UICompositor");
- scoped_refptr<InProcessContextProvider> worker_context_provider =
- InProcessContextProvider::CreateOffscreen(&gpu_memory_buffer_manager_,
- &image_factory_);
scoped_ptr<cc::OutputSurface> real_output_surface;
if (use_test_surface_) {
bool flipped_output_surface = false;
real_output_surface = make_scoped_ptr(new cc::PixelTestOutputSurface(
- context_provider, worker_context_provider, flipped_output_surface));
+ context_provider, flipped_output_surface));
} else {
- real_output_surface = make_scoped_ptr(
- new DirectOutputSurface(context_provider, worker_context_provider));
+ real_output_surface =
+ make_scoped_ptr(new DirectOutputSurface(context_provider));
}
if (surface_manager_) {
@@ -134,9 +129,9 @@
GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
compositor->GetRendererSettings(), compositor->task_runner()));
scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
- new cc::SurfaceDisplayOutputSurface(
- surface_manager_, compositor->surface_id_allocator(),
- context_provider, worker_context_provider));
+ new cc::SurfaceDisplayOutputSurface(surface_manager_,
+ compositor->surface_id_allocator(),
+ context_provider));
display_client->set_surface_output_surface(surface_output_surface.get());
surface_output_surface->set_display_client(display_client.get());
« no previous file with comments | « gpu/command_buffer/service/query_manager.cc ('k') | ui/compositor/test/in_process_context_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698