diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 21:30:36 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 21:30:36 +0000 |
| commit | 93da243043518e55b66431c3f0a1feda270189ca (patch) | |
| tree | 52d01b9b5de991b961412c8fce31af059738576d /cc/prioritized_resource_manager.cc | |
| parent | f205a5fc990bc1a16713bac9ca14c2a6d777af33 (diff) | |
| download | chromium_src-93da243043518e55b66431c3f0a1feda270189ca.zip chromium_src-93da243043518e55b66431c3f0a1feda270189ca.tar.gz chromium_src-93da243043518e55b66431c3f0a1feda270189ca.tar.bz2 | |
Set contents texture manager's limit to something reasonable
Otherwise, if we compositeAndReadback() before doing any 'normal' commits
the contents texture limit is 0 and we get no stuffs. This mainly impacts
layout tests.
BUG=
Review URL: https://codereview.chromium.org/11363254
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/prioritized_resource_manager.cc')
| -rw-r--r-- | cc/prioritized_resource_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/prioritized_resource_manager.cc b/cc/prioritized_resource_manager.cc index ba32324..9153440 100644 --- a/cc/prioritized_resource_manager.cc +++ b/cc/prioritized_resource_manager.cc @@ -15,9 +15,9 @@ using namespace std; namespace cc { -PrioritizedResourceManager::PrioritizedResourceManager(size_t maxMemoryLimitBytes, int, int pool, const Proxy* proxy) +PrioritizedResourceManager::PrioritizedResourceManager(int pool, const Proxy* proxy) : m_proxy(proxy) - , m_maxMemoryLimitBytes(maxMemoryLimitBytes) + , m_maxMemoryLimitBytes(defaultMemoryAllocationLimit()) , m_externalPriorityCutoff(PriorityCalculator::allowEverythingCutoff()) , m_memoryUseBytes(0) , m_memoryAboveCutoffBytes(0) |