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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 2256173002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replace a WrapUnique() nested inside a MakeUnique() Created 4 years, 3 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
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 6e94f4867cd31d5f7bed294e0892d3544e709427..d94cb12fb1c97d0aab0d76b210cf8cde526f8f97 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -469,34 +469,34 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
if (!display_output_surface) {
if (!create_gpu_output_surface) {
display_output_surface =
- base::WrapUnique(new SoftwareBrowserCompositorOutputSurface(
+ base::MakeUnique<SoftwareBrowserCompositorOutputSurface>(
CreateSoftwareOutputDevice(compositor.get()),
- compositor->vsync_manager(), begin_frame_source.get()));
+ compositor->vsync_manager(), begin_frame_source.get());
} else {
DCHECK(context_provider);
const auto& capabilities = context_provider->ContextCapabilities();
if (data->surface_handle == gpu::kNullSurfaceHandle) {
display_output_surface =
- base::WrapUnique(new OffscreenBrowserCompositorOutputSurface(
+ base::MakeUnique<OffscreenBrowserCompositorOutputSurface>(
context_provider, compositor->vsync_manager(),
begin_frame_source.get(),
- std::unique_ptr<display_compositor::
- CompositorOverlayCandidateValidator>()));
+ std::unique_ptr<
+ display_compositor::CompositorOverlayCandidateValidator>());
} else if (capabilities.surfaceless) {
#if defined(OS_MACOSX)
- display_output_surface = base::WrapUnique(new GpuOutputSurfaceMac(
+ display_output_surface = base::MakeUnique<GpuOutputSurfaceMac>(
context_provider, data->surface_handle, compositor->vsync_manager(),
begin_frame_source.get(),
CreateOverlayCandidateValidator(compositor->widget()),
- GetGpuMemoryBufferManager()));
+ GetGpuMemoryBufferManager());
#else
display_output_surface =
- base::WrapUnique(new GpuSurfacelessBrowserCompositorOutputSurface(
+ base::MakeUnique<GpuSurfacelessBrowserCompositorOutputSurface>(
context_provider, data->surface_handle,
compositor->vsync_manager(), begin_frame_source.get(),
CreateOverlayCandidateValidator(compositor->widget()),
GL_TEXTURE_2D, GL_RGB, ui::DisplaySnapshot::PrimaryFormat(),
- GetGpuMemoryBufferManager()));
+ GetGpuMemoryBufferManager());
#endif
} else {
std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
@@ -509,16 +509,16 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
#endif
if (!use_mus) {
display_output_surface =
- base::WrapUnique(new GpuBrowserCompositorOutputSurface(
+ base::MakeUnique<GpuBrowserCompositorOutputSurface>(
context_provider, compositor->vsync_manager(),
- begin_frame_source.get(), std::move(validator)));
+ begin_frame_source.get(), std::move(validator));
} else {
#if defined(USE_AURA)
display_output_surface =
- base::WrapUnique(new MusBrowserCompositorOutputSurface(
+ base::MakeUnique<MusBrowserCompositorOutputSurface>(
compositor->window(), context_provider,
compositor->vsync_manager(), begin_frame_source.get(),
- std::move(validator)));
+ std::move(validator));
#else
NOTREACHED();
#endif
« no previous file with comments | « content/browser/cache_storage/cache_storage_cache_unittest.cc ('k') | content/browser/compositor/reflector_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698