OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/resources/resource_provider.h" | 5 #include "cc/resources/resource_provider.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 | 9 |
10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
11 #include "base/debug/trace_event.h" | |
12 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
13 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
14 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
15 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 15 #include "base/trace_event/trace_event.h" |
16 #include "cc/base/util.h" | 16 #include "cc/base/util.h" |
17 #include "cc/output/gl_renderer.h" // For the GLC() macro. | 17 #include "cc/output/gl_renderer.h" // For the GLC() macro. |
18 #include "cc/resources/platform_color.h" | 18 #include "cc/resources/platform_color.h" |
19 #include "cc/resources/returned_resource.h" | 19 #include "cc/resources/returned_resource.h" |
20 #include "cc/resources/shared_bitmap_manager.h" | 20 #include "cc/resources/shared_bitmap_manager.h" |
21 #include "cc/resources/texture_uploader.h" | 21 #include "cc/resources/texture_uploader.h" |
22 #include "cc/resources/transferable_resource.h" | 22 #include "cc/resources/transferable_resource.h" |
23 #include "gpu/GLES2/gl2extchromium.h" | 23 #include "gpu/GLES2/gl2extchromium.h" |
24 #include "gpu/command_buffer/client/gles2_interface.h" | 24 #include "gpu/command_buffer/client/gles2_interface.h" |
25 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 25 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
(...skipping 2126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2152 ContextProvider* context_provider = output_surface_->context_provider(); | 2152 ContextProvider* context_provider = output_surface_->context_provider(); |
2153 return context_provider ? context_provider->ContextGL() : NULL; | 2153 return context_provider ? context_provider->ContextGL() : NULL; |
2154 } | 2154 } |
2155 | 2155 |
2156 class GrContext* ResourceProvider::GrContext() const { | 2156 class GrContext* ResourceProvider::GrContext() const { |
2157 ContextProvider* context_provider = output_surface_->context_provider(); | 2157 ContextProvider* context_provider = output_surface_->context_provider(); |
2158 return context_provider ? context_provider->GrContext() : NULL; | 2158 return context_provider ? context_provider->GrContext() : NULL; |
2159 } | 2159 } |
2160 | 2160 |
2161 } // namespace cc | 2161 } // namespace cc |
OLD | NEW |