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

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

Issue 660333004: cc cleanup: Update paths to geometry headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 2 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.h ('k') | cc/resources/resource_provider.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 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_ 5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 13 matching lines...) Expand all
24 #include "cc/resources/resource_format.h" 24 #include "cc/resources/resource_format.h"
25 #include "cc/resources/return_callback.h" 25 #include "cc/resources/return_callback.h"
26 #include "cc/resources/shared_bitmap.h" 26 #include "cc/resources/shared_bitmap.h"
27 #include "cc/resources/single_release_callback_impl.h" 27 #include "cc/resources/single_release_callback_impl.h"
28 #include "cc/resources/texture_mailbox.h" 28 #include "cc/resources/texture_mailbox.h"
29 #include "cc/resources/transferable_resource.h" 29 #include "cc/resources/transferable_resource.h"
30 #include "third_party/khronos/GLES2/gl2.h" 30 #include "third_party/khronos/GLES2/gl2.h"
31 #include "third_party/khronos/GLES2/gl2ext.h" 31 #include "third_party/khronos/GLES2/gl2ext.h"
32 #include "third_party/skia/include/core/SkBitmap.h" 32 #include "third_party/skia/include/core/SkBitmap.h"
33 #include "third_party/skia/include/core/SkCanvas.h" 33 #include "third_party/skia/include/core/SkCanvas.h"
34 #include "ui/gfx/size.h" 34 #include "ui/gfx/geometry/size.h"
35 35
36 class GrContext; 36 class GrContext;
37 37
38 namespace gpu { 38 namespace gpu {
39 namespace gles { 39 namespace gles {
40 class GLES2Interface; 40 class GLES2Interface;
41 } 41 }
42 } 42 }
43 43
44 namespace gfx { 44 namespace gfx {
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 return format_gl_data_format[format]; 607 return format_gl_data_format[format];
608 } 608 }
609 609
610 inline GLenum GLInternalFormat(ResourceFormat format) { 610 inline GLenum GLInternalFormat(ResourceFormat format) {
611 return GLDataFormat(format); 611 return GLDataFormat(format);
612 } 612 }
613 613
614 } // namespace cc 614 } // namespace cc
615 615
616 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 616 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW
« no previous file with comments | « cc/resources/resource.h ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698