| 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 "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 default: | 54 default: |
| 55 NOTREACHED(); | 55 NOTREACHED(); |
| 56 return 0; | 56 return 0; |
| 57 } | 57 } |
| 58 } | 58 } |
| 59 | 59 |
| 60 unsigned PixmapDepth(unsigned internalformat) { | 60 unsigned PixmapDepth(unsigned internalformat) { |
| 61 switch (internalformat) { | 61 switch (internalformat) { |
| 62 case GL_RGBA: | 62 case GL_RGBA: |
| 63 return 32u; | 63 return 32u; |
| 64 case GL_RGB: | |
| 65 return 24u; | |
| 66 default: | 64 default: |
| 67 NOTREACHED(); | 65 NOTREACHED(); |
| 68 return 0u; | 66 return 0u; |
| 69 } | 67 } |
| 70 } | 68 } |
| 71 | 69 |
| 72 bool ActualPixmapGeometry(XID pixmap, gfx::Size* size, unsigned* depth) { | 70 bool ActualPixmapGeometry(XID pixmap, gfx::Size* size, unsigned* depth) { |
| 73 XID root_return; | 71 XID root_return; |
| 74 int x_return; | 72 int x_return; |
| 75 int y_return; | 73 int y_return; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 | 200 |
| 203 bool GLImageGLX::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, | 201 bool GLImageGLX::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, |
| 204 int z_order, | 202 int z_order, |
| 205 OverlayTransform transform, | 203 OverlayTransform transform, |
| 206 const Rect& bounds_rect, | 204 const Rect& bounds_rect, |
| 207 const RectF& crop_rect) { | 205 const RectF& crop_rect) { |
| 208 return false; | 206 return false; |
| 209 } | 207 } |
| 210 | 208 |
| 211 } // namespace gfx | 209 } // namespace gfx |
| OLD | NEW |