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

Side by Side Diff: content/browser/renderer_host/compositing_iosurface_mac.mm

Issue 10351002: ui: Move surface/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix gpu DEPS Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/compositing_iosurface_mac.h" 5 #include "content/browser/renderer_host/compositing_iosurface_mac.h"
6 6
7 #include <OpenGL/OpenGL.h> 7 #include <OpenGL/OpenGL.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "content/browser/renderer_host/render_widget_host_view_mac.h" 12 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "ui/gfx/gl/gl_context.h" 14 #include "ui/gfx/gl/gl_context.h"
15 #include "ui/gfx/gl/gl_switches.h" 15 #include "ui/gfx/gl/gl_switches.h"
16 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 16 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
17 #include "ui/gfx/surface/io_surface_support_mac.h" 17 #include "ui/surface/io_surface_support_mac.h"
18 18
19 #ifdef NDEBUG 19 #ifdef NDEBUG
20 #define CHECK_GL_ERROR() 20 #define CHECK_GL_ERROR()
21 #else 21 #else
22 #define CHECK_GL_ERROR() do { \ 22 #define CHECK_GL_ERROR() do { \
23 GLenum gl_error = glGetError(); \ 23 GLenum gl_error = glGetError(); \
24 LOG_IF(ERROR, gl_error != GL_NO_ERROR) << "GL Error :" << gl_error; \ 24 LOG_IF(ERROR, gl_error != GL_NO_ERROR) << "GL Error :" << gl_error; \
25 } while (0) 25 } while (0)
26 #endif 26 #endif
27 27
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 } 301 }
302 302
303 void CompositingIOSurfaceMac::GlobalFrameDidChange() { 303 void CompositingIOSurfaceMac::GlobalFrameDidChange() {
304 [glContext_ update]; 304 [glContext_ update];
305 } 305 }
306 306
307 void CompositingIOSurfaceMac::ClearDrawable() { 307 void CompositingIOSurfaceMac::ClearDrawable() {
308 [glContext_ clearDrawable]; 308 [glContext_ clearDrawable];
309 UnrefIOSurface(); 309 UnrefIOSurface();
310 } 310 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/backing_store_win.cc ('k') | content/browser/renderer_host/image_transport_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698