ui/android/resources/crushed_sprite_resource.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/android/resources/crushed_sprite_resource.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/android/resources/crushed_sprite_resource.h

diff --git a/ui/android/resources/crushed_sprite_resource.h b/ui/android/resources/crushed_sprite_resource.h

index bf3ce85a88ce26d3dc719ff8bb09344519b2da42..9ffa25a7966656503bf1088c98d4432bf073bae8 100644

--- a/ui/android/resources/crushed_sprite_resource.h

+++ b/ui/android/resources/crushed_sprite_resource.h

@@ -5,11 +5,11 @@

#ifndef UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_

#define UI_ANDROID_RESOURCES_CRUSHED_SPRITE_RESOURCE_H_

+#include <memory>

#include <utility>

#include <vector>

#include "base/macros.h"

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

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

#include "ui/android/ui_android_export.h"

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

@@ -73,7 +73,7 @@ class UI_ANDROID_EXPORT CrushedSpriteResource {

private:

SkBitmap bitmap_;

- scoped_ptr<cc::ScopedUIResource> last_frame_resource_;

+ std::unique_ptr<cc::ScopedUIResource> last_frame_resource_;

SrcDstRects src_dst_rects_;

gfx::Size unscaled_sprite_size_;

gfx::Size scaled_sprite_size_;

« no previous file with comments | « ui/android/overscroll_glow.h ('k') | ui/android/resources/resource_manager.h » ('j') | no next file with comments »