Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2504)

Side by Side Diff: cc/resources/resource_provider.cc

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/raster/staging_buffer_pool.cc ('k') | cc/resources/video_resource_updater_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 23 matching lines...) Expand all
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" 40 #include "third_party/skia/include/gpu/GrTextureProvider.h"
41 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" 41 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
42 #include "ui/gfx/geometry/rect.h" 42 #include "ui/gfx/geometry/rect.h"
43 #include "ui/gfx/geometry/vector2d.h" 43 #include "ui/gfx/geometry/vector2d.h"
44 #include "ui/gfx/gpu_memory_buffer_tracing.h"
44 #include "ui/gfx/icc_profile.h" 45 #include "ui/gfx/icc_profile.h"
45 #include "ui/gl/trace_util.h" 46 #include "ui/gl/trace_util.h"
46 47
47 using gpu::gles2::GLES2Interface; 48 using gpu::gles2::GLES2Interface;
48 49
49 namespace cc { 50 namespace cc {
50 51
51 class IdAllocator { 52 class IdAllocator {
52 public: 53 public:
53 virtual ~IdAllocator() {} 54 virtual ~IdAllocator() {}
(...skipping 2000 matching lines...) Expand 10 before | Expand all | Expand 10 after
2054 2055
2055 const int kImportance = 2; 2056 const int kImportance = 2;
2056 pmd->CreateSharedGlobalAllocatorDump(guid); 2057 pmd->CreateSharedGlobalAllocatorDump(guid);
2057 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); 2058 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
2058 } 2059 }
2059 2060
2060 return true; 2061 return true;
2061 } 2062 }
2062 2063
2063 } // namespace cc 2064 } // namespace cc
OLDNEW
« no previous file with comments | « cc/raster/staging_buffer_pool.cc ('k') | cc/resources/video_resource_updater_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698