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

Side by Side Diff: ui/gl/gl_image_io_surface.h

Issue 1227363005: mac: Include <IOSurface/IOSurface.h> instead of <IOSurface/IOSurfaceAPI.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/accelerated_widget_mac/io_surface_texture.h ('k') | ui/surface/accelerated_surface_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef UI_GL_GL_IMAGE_IO_SURFACE_H_ 5 #ifndef UI_GL_GL_IMAGE_IO_SURFACE_H_
6 #define UI_GL_GL_IMAGE_IO_SURFACE_H_ 6 #define UI_GL_GL_IMAGE_IO_SURFACE_H_
7 7
8 #include <IOSurface/IOSurfaceAPI.h> 8 #include <IOSurface/IOSurface.h>
9 9
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
11 #include "base/threading/thread_checker.h" 11 #include "base/threading/thread_checker.h"
12 #include "ui/gfx/gpu_memory_buffer.h" 12 #include "ui/gfx/gpu_memory_buffer.h"
13 #include "ui/gl/gl_image.h" 13 #include "ui/gl/gl_image.h"
14 14
15 namespace gfx { 15 namespace gfx {
16 16
17 class GL_EXPORT GLImageIOSurface : public GLImage { 17 class GL_EXPORT GLImageIOSurface : public GLImage {
18 public: 18 public:
(...skipping 29 matching lines...) Expand all
48 GpuMemoryBuffer::Format format_; 48 GpuMemoryBuffer::Format format_;
49 base::ScopedCFTypeRef<IOSurfaceRef> io_surface_; 49 base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
50 base::ThreadChecker thread_checker_; 50 base::ThreadChecker thread_checker_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface); 52 DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface);
53 }; 53 };
54 54
55 } // namespace gfx 55 } // namespace gfx
56 56
57 #endif // UI_GL_GL_IMAGE_IO_SURFACE_H_ 57 #endif // UI_GL_GL_IMAGE_IO_SURFACE_H_
OLDNEW
« no previous file with comments | « ui/accelerated_widget_mac/io_surface_texture.h ('k') | ui/surface/accelerated_surface_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698