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 #include "ui/gl/gl_surface.h" | 5 #include "ui/gl/gl_surface.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
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" | |
12 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
13 #include "base/logging.h" | 12 #include "base/logging.h" |
14 #include "base/threading/thread_local.h" | 13 #include "base/threading/thread_local.h" |
| 14 #include "base/trace_event/trace_event.h" |
15 #include "ui/gl/gl_context.h" | 15 #include "ui/gl/gl_context.h" |
16 #include "ui/gl/gl_implementation.h" | 16 #include "ui/gl/gl_implementation.h" |
17 #include "ui/gl/gl_switches.h" | 17 #include "ui/gl/gl_switches.h" |
18 | 18 |
19 #if defined(USE_X11) | 19 #if defined(USE_X11) |
20 #include <X11/Xlib.h> | 20 #include <X11/Xlib.h> |
21 #endif | 21 #endif |
22 | 22 |
23 namespace gfx { | 23 namespace gfx { |
24 | 24 |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 z_order, transform, image, bounds_rect, crop_rect); | 395 z_order, transform, image, bounds_rect, crop_rect); |
396 } | 396 } |
397 | 397 |
398 bool GLSurfaceAdapter::IsSurfaceless() const { | 398 bool GLSurfaceAdapter::IsSurfaceless() const { |
399 return surface_->IsSurfaceless(); | 399 return surface_->IsSurfaceless(); |
400 } | 400 } |
401 | 401 |
402 GLSurfaceAdapter::~GLSurfaceAdapter() {} | 402 GLSurfaceAdapter::~GLSurfaceAdapter() {} |
403 | 403 |
404 } // namespace gfx | 404 } // namespace gfx |
OLD | NEW |