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/resource_provider.h" | 5 #include "cc/resource_provider.h" |
6 | 6 |
7 #include <limits.h> | 7 #include <limits.h> |
8 | 8 |
9 #include "base/debug/alias.h" | 9 #include "base/debug/alias.h" |
10 #include "base/hash_tables.h" | 10 #include "base/hash_tables.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "base/string_split.h" | 12 #include "base/string_split.h" |
13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
14 #include "cc/gl_renderer.h" // For the GLC() macro. | 14 #include "cc/gl_renderer.h" // For the GLC() macro. |
15 #include "cc/platform_color.h" | 15 #include "cc/platform_color.h" |
16 #include "cc/texture_uploader.h" | 16 #include "cc/texture_uploader.h" |
17 #include "cc/transferable_resource.h" | 17 #include "cc/transferable_resource.h" |
| 18 #include "gpu/GLES2/gl2extchromium.h" |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" | 19 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" |
19 #include "third_party/khronos/GLES2/gl2.h" | 20 #include "third_party/khronos/GLES2/gl2.h" |
20 #include "third_party/khronos/GLES2/gl2ext.h" | 21 #include "third_party/khronos/GLES2/gl2ext.h" |
21 #include "ui/gfx/rect.h" | 22 #include "ui/gfx/rect.h" |
22 #include "ui/gfx/vector2d.h" | 23 #include "ui/gfx/vector2d.h" |
23 | 24 |
24 using WebKit::WebGraphicsContext3D; | 25 using WebKit::WebGraphicsContext3D; |
25 | 26 |
26 namespace cc { | 27 namespace cc { |
27 | 28 |
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
986 return false; | 987 return false; |
987 } | 988 } |
988 | 989 |
989 resource->pendingSetPixels = false; | 990 resource->pendingSetPixels = false; |
990 unlockForWrite(id); | 991 unlockForWrite(id); |
991 | 992 |
992 return true; | 993 return true; |
993 } | 994 } |
994 | 995 |
995 } // namespace cc | 996 } // namespace cc |
OLD | NEW |