| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "gpu/GLES2/gl2extchromium.h" | 30 #include "gpu/GLES2/gl2extchromium.h" |
| 31 #include "gpu/command_buffer/client/context_support.h" | 31 #include "gpu/command_buffer/client/context_support.h" |
| 32 #include "gpu/command_buffer/client/gles2_interface.h" | 32 #include "gpu/command_buffer/client/gles2_interface.h" |
| 33 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 33 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| 34 #include "skia/ext/texture_handle.h" | 34 #include "skia/ext/texture_handle.h" |
| 35 #include "third_party/khronos/GLES2/gl2.h" | 35 #include "third_party/khronos/GLES2/gl2.h" |
| 36 #include "third_party/khronos/GLES2/gl2ext.h" | 36 #include "third_party/khronos/GLES2/gl2ext.h" |
| 37 #include "third_party/skia/include/core/SkCanvas.h" | 37 #include "third_party/skia/include/core/SkCanvas.h" |
| 38 #include "third_party/skia/include/core/SkSurface.h" | 38 #include "third_party/skia/include/core/SkSurface.h" |
| 39 #include "third_party/skia/include/gpu/GrContext.h" | 39 #include "third_party/skia/include/gpu/GrContext.h" |
| 40 #include "third_party/skia/include/gpu/GrTextureProvider.h" | |
| 41 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" | 40 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" |
| 42 #include "ui/gfx/geometry/rect.h" | 41 #include "ui/gfx/geometry/rect.h" |
| 43 #include "ui/gfx/geometry/vector2d.h" | 42 #include "ui/gfx/geometry/vector2d.h" |
| 44 #include "ui/gfx/gpu_memory_buffer_tracing.h" | 43 #include "ui/gfx/gpu_memory_buffer_tracing.h" |
| 45 #include "ui/gfx/icc_profile.h" | 44 #include "ui/gfx/icc_profile.h" |
| 46 #include "ui/gl/trace_util.h" | 45 #include "ui/gl/trace_util.h" |
| 47 | 46 |
| 48 using gpu::gles2::GLES2Interface; | 47 using gpu::gles2::GLES2Interface; |
| 49 | 48 |
| 50 namespace cc { | 49 namespace cc { |
| (...skipping 2122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2173 | 2172 |
| 2174 const int kImportance = 2; | 2173 const int kImportance = 2; |
| 2175 pmd->CreateSharedGlobalAllocatorDump(guid); | 2174 pmd->CreateSharedGlobalAllocatorDump(guid); |
| 2176 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); | 2175 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); |
| 2177 } | 2176 } |
| 2178 | 2177 |
| 2179 return true; | 2178 return true; |
| 2180 } | 2179 } |
| 2181 | 2180 |
| 2182 } // namespace cc | 2181 } // namespace cc |
| OLD | NEW |