diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 04:45:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 04:45:51 +0000 |
| commit | 5c47074d69bc278f6fbce11cb1122c17f4a8a353 (patch) | |
| tree | 633fc0d9c8b546572d18630df0c889cf64f07f25 /cc | |
| parent | 82e271fe63c9d5193ddda225964ce58ea97e0f80 (diff) | |
| download | chromium_src-5c47074d69bc278f6fbce11cb1122c17f4a8a353.zip chromium_src-5c47074d69bc278f6fbce11cb1122c17f4a8a353.tar.gz chromium_src-5c47074d69bc278f6fbce11cb1122c17f4a8a353.tar.bz2 | |
Reland "cc: Switch PrioritizedTextureManager to std::vector."
It was reverted because it failed in XP bots.
CCLayerTreeHostTestScrollChildLayerNormalDpi.runMultiThread:
layer_tree_host_unittest.cc(2304): error: Value of: IntSize()
Actual: 8-byte object <00-00 00-00 00-00 00-00>
Expected: rootScrollLayer->scrollDelta()
Which is: 8-byte object <00-00 00-40 00-00 00-00>
layer_tree_host_unittest.cc(2279): error: Value of: m_rootScrollLayer->scrollPosition()
Actual: 8-byte object <02-00 00-00 00-00 00-00>
Expected: IntPoint()
Which is: 8-byte object <00-00 00-00 00-00 00-00>
layer_tree_host_unittest.cc(2340): error: Value of: m_rootScrolls
Actual: 1
Expected: 0
BUG=154451
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org,danakj@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11231023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/prioritized_texture_manager.cc | 2 | ||||
| -rw-r--r-- | cc/prioritized_texture_manager.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cc/prioritized_texture_manager.cc b/cc/prioritized_texture_manager.cc index d766380..208a764 100644 --- a/cc/prioritized_texture_manager.cc +++ b/cc/prioritized_texture_manager.cc @@ -53,7 +53,7 @@ void CCPrioritizedTextureManager::prioritizeTextures() // Copy all textures into a vector and sort them. for (TextureSet::iterator it = m_textures.begin(); it != m_textures.end(); ++it) - sortedTextures.append(*it); + sortedTextures.push_back(*it); std::sort(sortedTextures.begin(), sortedTextures.end(), compareTextures); m_memoryAvailableBytes = m_maxMemoryLimitBytes; diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h index 64b3abe..b23ef2e 100644 --- a/cc/prioritized_texture_manager.h +++ b/cc/prioritized_texture_manager.h @@ -5,6 +5,9 @@ #ifndef CCPrioritizedTextureManager_h #define CCPrioritizedTextureManager_h +#include <list> +#include <vector> + #include "CCPrioritizedTexture.h" #include "CCPriorityCalculator.h" #include "IntRect.h" @@ -14,8 +17,6 @@ #include "base/memory/scoped_ptr.h" #include "cc/texture.h" #include "third_party/khronos/GLES2/gl2.h" -#include <wtf/Vector.h> -#include <list> #if defined(COMPILER_GCC) namespace BASE_HASH_NAMESPACE { @@ -151,7 +152,7 @@ private: int m_pool; typedef base::hash_set<CCPrioritizedTexture*> TextureSet; - typedef Vector<CCPrioritizedTexture*> TextureVector; + typedef std::vector<CCPrioritizedTexture*> TextureVector; TextureSet m_textures; // This list is always sorted in eviction order, with the exception the |