ui/ozone/platform/caca/caca_window_manager.cc - Issue 659713003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/ozone/platform/caca/caca_window_manager.cc

Issue 659713003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Simplify Created 6 years, 2 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 unified diff | Download patch

« no previous file with comments | « ui/gfx/geometry/r_tree_unittest.cc ('k') | ui/ozone/platform/caca/ozone_platform_caca.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/ozone/platform/caca/caca_window_manager.h"	5 #include "ui/ozone/platform/caca/caca_window_manager.h"

6	6

7 #include "base/debug/trace_event.h"	7 #include "base/debug/trace_event.h"

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

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

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

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128 }	128 }

129	129

130 scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget(	130 scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget(

131 gfx::AcceleratedWidget widget) {	131 gfx::AcceleratedWidget widget) {

132 CacaWindow* window = windows_.Lookup(widget);	132 CacaWindow* window = windows_.Lookup(widget);

133 DCHECK(window);	133 DCHECK(window);

134	134

135 scoped_ptr<CacaSurface> canvas(new CacaSurface(window));	135 scoped_ptr<CacaSurface> canvas(new CacaSurface(window));

136 bool initialized = canvas->Initialize();	136 bool initialized = canvas->Initialize();

137 DCHECK(initialized);	137 DCHECK(initialized);

138 return canvas.PassAs<ui::SurfaceOzoneCanvas>();	138 return canvas.Pass();

139 }	139 }

140	140

141 } // namespace ui	141 } // namespace ui

OLD	NEW