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/grcontext_provider.h" |
15 #include "cc/platform_color.h" | 16 #include "cc/platform_color.h" |
16 #include "cc/texture_uploader.h" | 17 #include "cc/texture_uploader.h" |
17 #include "cc/transferable_resource.h" | 18 #include "cc/transferable_resource.h" |
18 #include "gpu/GLES2/gl2extchromium.h" | 19 #include "gpu/GLES2/gl2extchromium.h" |
19 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" | 20 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" |
20 #include "third_party/khronos/GLES2/gl2.h" | 21 #include "third_party/khronos/GLES2/gl2.h" |
21 #include "third_party/khronos/GLES2/gl2ext.h" | 22 #include "third_party/khronos/GLES2/gl2ext.h" |
22 #include "ui/gfx/rect.h" | 23 #include "ui/gfx/rect.h" |
23 #include "ui/gfx/vector2d.h" | 24 #include "ui/gfx/vector2d.h" |
24 | 25 |
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1077 } | 1078 } |
1078 | 1079 |
1079 void ResourceProvider::enableReadLockFences(ResourceProvider::ResourceId id, boo
l enable) { | 1080 void ResourceProvider::enableReadLockFences(ResourceProvider::ResourceId id, boo
l enable) { |
1080 DCHECK(m_threadChecker.CalledOnValidThread()); | 1081 DCHECK(m_threadChecker.CalledOnValidThread()); |
1081 ResourceMap::iterator it = m_resources.find(id); | 1082 ResourceMap::iterator it = m_resources.find(id); |
1082 CHECK(it != m_resources.end()); | 1083 CHECK(it != m_resources.end()); |
1083 Resource* resource = &it->second; | 1084 Resource* resource = &it->second; |
1084 resource->enableReadLockFences = enable; | 1085 resource->enableReadLockFences = enable; |
1085 } | 1086 } |
1086 | 1087 |
| 1088 void ResourceProvider::setContext3dForGrContext(WebKit::WebGraphicsContext3D* co
ntext3d) { |
| 1089 m_grContextProvider.SetContext3d(context3d); |
| 1090 } |
| 1091 |
1087 } // namespace cc | 1092 } // namespace cc |
OLD | NEW |