cc/output/software_output_device.h - Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/output/software_output_device.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scopedptrcc: rebase Created 4 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:

Index: cc/output/software_output_device.h

diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h

index 397229742fc20dc759d698a7828593f39dd4517c..109fc90f387e7e353a3dea135c1bab53a18bd87e 100644

--- a/cc/output/software_output_device.h

+++ b/cc/output/software_output_device.h

@@ -5,8 +5,9 @@

#ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_

#define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "cc/base/cc_export.h"

#include "third_party/skia/include/core/SkSurface.h"

#include "ui/gfx/geometry/rect.h"

@@ -60,7 +61,7 @@ class CC_EXPORT SoftwareOutputDevice {

float scale_factor_;

gfx::Rect damage_rect_;

sk_sp<SkSurface> surface_;

- scoped_ptr<gfx::VSyncProvider> vsync_provider_;

+ std::unique_ptr<gfx::VSyncProvider> vsync_provider_;

private:

DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice);

« no previous file with comments | « cc/output/shader_unittest.cc ('k') | cc/output/software_renderer.h » ('j') | no next file with comments »