Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: gpu/ipc/common/gpu_memory_buffer_support.cc

Issue 2705333006: Move client_native_pixmap_factory.h from ui/ozone/public to ui/gfx (Closed)
Patch Set: Fix trace Created 3 years, 9 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "gpu/ipc/common/gpu_memory_buffer_support.h" 5 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(USE_OZONE) 10 #if defined(USE_OZONE)
11 #include "ui/ozone/public/client_native_pixmap_factory.h" 11 #include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
12 #endif 12 #endif
13 13
14 namespace gpu { 14 namespace gpu {
15 15
16 gfx::GpuMemoryBufferType GetNativeGpuMemoryBufferType() { 16 gfx::GpuMemoryBufferType GetNativeGpuMemoryBufferType() {
17 #if defined(OS_MACOSX) 17 #if defined(OS_MACOSX)
18 return gfx::IO_SURFACE_BUFFER; 18 return gfx::IO_SURFACE_BUFFER;
19 #endif 19 #endif
20 #if defined(USE_OZONE) 20 #if defined(USE_OZONE)
21 return gfx::NATIVE_PIXMAP; 21 return gfx::NATIVE_PIXMAP;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 return ui::ClientNativePixmapFactory::GetInstance()->IsConfigurationSupported( 54 return ui::ClientNativePixmapFactory::GetInstance()->IsConfigurationSupported(
55 format, usage); 55 format, usage);
56 #endif 56 #endif
57 57
58 NOTREACHED(); 58 NOTREACHED();
59 return false; 59 return false;
60 } 60 }
61 61
62 } // namespace gpu 62 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698