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

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

Issue 1939143002: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad rebase Created 4 years, 7 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/resources/resource_provider.h ('k') | cc/resources/video_resource_updater.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 16 matching lines...) Expand all
27 #include "cc/resources/returned_resource.h" 27 #include "cc/resources/returned_resource.h"
28 #include "cc/resources/shared_bitmap_manager.h" 28 #include "cc/resources/shared_bitmap_manager.h"
29 #include "cc/resources/transferable_resource.h" 29 #include "cc/resources/transferable_resource.h"
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/SkSurface.h" 38 #include "third_party/skia/include/core/SkSurface.h"
38 #include "third_party/skia/include/gpu/GrContext.h" 39 #include "third_party/skia/include/gpu/GrContext.h"
39 #include "third_party/skia/include/gpu/GrTextureProvider.h" 40 #include "third_party/skia/include/gpu/GrTextureProvider.h"
40 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" 41 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
41 #include "ui/gfx/geometry/rect.h" 42 #include "ui/gfx/geometry/rect.h"
42 #include "ui/gfx/geometry/vector2d.h" 43 #include "ui/gfx/geometry/vector2d.h"
43 #include "ui/gl/trace_util.h" 44 #include "ui/gl/trace_util.h"
44 45
45 using gpu::gles2::GLES2Interface; 46 using gpu::gles2::GLES2Interface;
46 47
(...skipping 1913 matching lines...) Expand 10 before | Expand all | Expand 10 after
1960 1961
1961 const int kImportance = 2; 1962 const int kImportance = 2;
1962 pmd->CreateSharedGlobalAllocatorDump(guid); 1963 pmd->CreateSharedGlobalAllocatorDump(guid);
1963 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); 1964 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
1964 } 1965 }
1965 1966
1966 return true; 1967 return true;
1967 } 1968 }
1968 1969
1969 } // namespace cc 1970 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_provider.h ('k') | cc/resources/video_resource_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698