| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 | 133 |
| 134 scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget( | 134 scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget( |
| 135 gfx::AcceleratedWidget widget) { | 135 gfx::AcceleratedWidget widget) { |
| 136 DCHECK(thread_checker_.CalledOnValidThread()); | 136 DCHECK(thread_checker_.CalledOnValidThread()); |
| 137 CacaWindow* window = windows_.Lookup(widget); | 137 CacaWindow* window = windows_.Lookup(widget); |
| 138 DCHECK(window); | 138 DCHECK(window); |
| 139 | 139 |
| 140 scoped_ptr<CacaSurface> canvas(new CacaSurface(window)); | 140 scoped_ptr<CacaSurface> canvas(new CacaSurface(window)); |
| 141 bool initialized = canvas->Initialize(); | 141 bool initialized = canvas->Initialize(); |
| 142 DCHECK(initialized); | 142 DCHECK(initialized); |
| 143 return canvas; | 143 return std::move(canvas); |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace ui | 146 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1603343003:
Fix caca backend build. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master