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/trace_event/trace_event.h" | 7 #include "base/trace_event/trace_event.h" |
8 #include "third_party/skia/include/core/SkCanvas.h" | 8 #include "third_party/skia/include/core/SkCanvas.h" |
9 #include "third_party/skia/include/core/SkSurface.h" | 9 #include "third_party/skia/include/core/SkSurface.h" |
10 #include "ui/gfx/skia_util.h" | 10 #include "ui/gfx/skia_util.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
130 | 130 |
131 scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget( | 131 scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget( |
132 gfx::AcceleratedWidget widget) { | 132 gfx::AcceleratedWidget widget) { |
133 DCHECK(thread_checker_.CalledOnValidThread()); | 133 DCHECK(thread_checker_.CalledOnValidThread()); |
134 CacaWindow* window = windows_.Lookup(widget); | 134 CacaWindow* window = windows_.Lookup(widget); |
135 DCHECK(window); | 135 DCHECK(window); |
136 | 136 |
137 scoped_ptr<CacaSurface> canvas(new CacaSurface(window)); | 137 scoped_ptr<CacaSurface> canvas(new CacaSurface(window)); |
138 bool initialized = canvas->Initialize(); | 138 bool initialized = canvas->Initialize(); |
139 DCHECK(initialized); | 139 DCHECK(initialized); |
140 return canvas.Pass(); | 140 return std::move(canvas); |
spang
2015/12/16 17:25:32
Unnecessary move. Just
return canvas;
mkollaro
2015/12/17 12:02:37
Done.
| |
141 } | 141 } |
142 | 142 |
143 } // namespace ui | 143 } // namespace ui |
OLD | NEW |