content/renderer/child_frame_compositing_helper.h - Issue 1873783003: Convert //content/renderer 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/renderer/child_frame_compositing_helper.h

Issue 1873783003: Convert //content/renderer 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/renderer/cache_storage/cache_storage_dispatcher.cc ('k') | content/renderer/device_sensors/device_light_event_pump.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/child_frame_compositing_helper.h

diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h

index fda84a7755d191a9e9f6371bd1824cd29468f0a1..47c2025154c275b9972dfa15f058d3baf430a08a 100644

--- a/content/renderer/child_frame_compositing_helper.h

+++ b/content/renderer/child_frame_compositing_helper.h

@@ -7,12 +7,12 @@

#include <stdint.h>

+#include <memory>

#include <string>

#include <vector>

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

#include "base/memory/shared_memory.h"

#include "base/memory/weak_ptr.h"

#include "cc/surfaces/surface_id.h"

@@ -122,7 +122,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper

base::WeakPtr<BrowserPlugin> browser_plugin_;

RenderFrameProxy* render_frame_proxy_;

- scoped_ptr<blink::WebLayer> web_layer_;

+ std::unique_ptr<blink::WebLayer> web_layer_;

cc::SurfaceId surface_id_;

blink::WebFrame* frame_;