| OLD | NEW |
| 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 extern "C" { | 5 extern "C" { |
| 6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
| 7 } | 7 } |
| 8 | 8 |
| 9 #include <memory> |
| 10 |
| 9 #include "base/logging.h" | 11 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 #include "ui/gl/gl_bindings.h" | 12 #include "ui/gl/gl_bindings.h" |
| 12 #include "ui/gl/gl_image_glx.h" | 13 #include "ui/gl/gl_image_glx.h" |
| 13 #include "ui/gl/gl_surface_glx.h" | 14 #include "ui/gl/gl_surface_glx.h" |
| 14 | 15 |
| 15 namespace gl { | 16 namespace gl { |
| 16 namespace { | 17 namespace { |
| 17 | 18 |
| 18 bool ValidFormat(unsigned internalformat) { | 19 bool ValidFormat(unsigned internalformat) { |
| 19 switch (internalformat) { | 20 switch (internalformat) { |
| 20 case GL_RGB: | 21 case GL_RGB: |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 return false; | 202 return false; |
| 202 } | 203 } |
| 203 | 204 |
| 204 void GLImageGLX::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, | 205 void GLImageGLX::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, |
| 205 uint64_t process_tracing_id, | 206 uint64_t process_tracing_id, |
| 206 const std::string& dump_name) { | 207 const std::string& dump_name) { |
| 207 // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914 | 208 // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914 |
| 208 } | 209 } |
| 209 | 210 |
| 210 } // namespace gl | 211 } // namespace gl |
| OLD | NEW |