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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "CCResourceProvider.h" | 7 #include "cc/resource_provider.h" |
8 #ifdef LOG | 8 #ifdef LOG |
9 #undef LOG | 9 #undef LOG |
10 #endif | 10 #endif |
11 | 11 |
12 #include <limits.h> | 12 #include <limits.h> |
13 | 13 |
14 #include "CCProxy.h" | |
15 #include "CCRendererGL.h" // For the GLC() macro. | |
16 #include "Extensions3DChromium.h" | 14 #include "Extensions3DChromium.h" |
17 #include "IntRect.h" | 15 #include "IntRect.h" |
18 #include "base/debug/alias.h" | 16 #include "base/debug/alias.h" |
19 #include "base/hash_tables.h" | 17 #include "base/hash_tables.h" |
20 #include "base/stl_util.h" | 18 #include "base/stl_util.h" |
21 #include "base/string_split.h" | 19 #include "base/string_split.h" |
22 #include "base/string_util.h" | 20 #include "base/string_util.h" |
| 21 #include "cc/gl_renderer.h" // For the GLC() macro. |
23 #include "cc/layer_texture_sub_image.h" | 22 #include "cc/layer_texture_sub_image.h" |
| 23 #include "cc/proxy.h" |
24 #include "cc/throttled_texture_uploader.h" | 24 #include "cc/throttled_texture_uploader.h" |
25 #include "cc/unthrottled_texture_uploader.h" | 25 #include "cc/unthrottled_texture_uploader.h" |
26 #include <public/WebGraphicsContext3D.h> | 26 #include <public/WebGraphicsContext3D.h> |
27 | 27 |
28 using WebKit::WebGraphicsContext3D; | 28 using WebKit::WebGraphicsContext3D; |
29 | 29 |
30 namespace cc { | 30 namespace cc { |
31 | 31 |
32 static GC3Denum textureToStorageFormat(GC3Denum textureFormat) | 32 static GC3Denum textureToStorageFormat(GC3Denum textureFormat) |
33 { | 33 { |
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.e
nd(); ++it) { | 646 for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.e
nd(); ++it) { |
647 if (ContainsKey(childPoolSet, it->second.pool)) | 647 if (ContainsKey(childPoolSet, it->second.pool)) |
648 ++maxMailboxCount; | 648 ++maxMailboxCount; |
649 } | 649 } |
650 } | 650 } |
651 while (m_mailboxes.size() > maxMailboxCount) | 651 while (m_mailboxes.size() > maxMailboxCount) |
652 m_mailboxes.removeFirst(); | 652 m_mailboxes.removeFirst(); |
653 } | 653 } |
654 | 654 |
655 } | 655 } |
OLD | NEW |