content/browser/compositor/software_output_device_win.h - Issue 1874893002: Convert //content/browser 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: content/browser/compositor/software_output_device_win.h

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

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/software_output_device_ozone_unittest.cc ('k') | content/browser/compositor/surface_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/software_output_device_win.h

diff --git a/content/browser/compositor/software_output_device_win.h b/content/browser/compositor/software_output_device_win.h

index 5c80340808c2437442cee1d35b4359b2ab9a1d31..61066ceaa9482344b6c7e0301d97a6d117f6e7c4 100644

--- a/content/browser/compositor/software_output_device_win.h

+++ b/content/browser/compositor/software_output_device_win.h

@@ -5,13 +5,13 @@

#ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_

#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_

-#include <windows.h>

#include <stddef.h>

+#include <windows.h>

+#include <memory>

#include <vector>

#include "base/macros.h"

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

#include "cc/output/software_output_device.h"

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

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

@@ -41,7 +41,7 @@ class OutputDeviceBacking {

size_t GetMaxByteSize();

std::vector<SoftwareOutputDeviceWin*> devices_;

- scoped_ptr<base::SharedMemory> backing_;

+ std::unique_ptr<base::SharedMemory> backing_;

size_t created_byte_size_;

DISALLOW_COPY_AND_ASSIGN(OutputDeviceBacking);

« no previous file with comments | « content/browser/compositor/software_output_device_ozone_unittest.cc ('k') | content/browser/compositor/surface_utils.h » ('j') | no next file with comments »