diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 23:58:33 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 23:58:33 +0000 |
| commit | f72804892c91e5f45074922af62f9ec60f8b1e38 (patch) | |
| tree | 47ff1ca6cd479ec8f107c23e6398fd0785a1bbd4 /cc | |
| parent | b5eb18e5328f93642c1fad5dfb240d98b4c68251 (diff) | |
| download | chromium_src-f72804892c91e5f45074922af62f9ec60f8b1e38.zip chromium_src-f72804892c91e5f45074922af62f9ec60f8b1e38.tar.gz chromium_src-f72804892c91e5f45074922af62f9ec60f8b1e38.tar.bz2 | |
Fix issue where CCprioritizedTexture::Backing's requestPriorityAtLastPriorityUpdate returns a bool instead of an int.
This bug effectively disables the prioritized texture manager (so as soon as you hit memory pressure, we discard textures in more-or-less random order).
This needs to be integrated to M23 as well.
BUG=152050
Review URL: https://chromiumcodereview.appspot.com/10986006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/CCPrioritizedTexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/CCPrioritizedTexture.h b/cc/CCPrioritizedTexture.h index cd33d11..9f416e7 100644 --- a/cc/CCPrioritizedTexture.h +++ b/cc/CCPrioritizedTexture.h @@ -93,7 +93,7 @@ private: CCPrioritizedTexture* owner() { return m_owner; } bool hadOwnerAtLastPriorityUpdate() const { return m_ownerExistedAtLastPriorityUpdate; } - bool requestPriorityAtLastPriorityUpdate() const { return m_priorityAtLastPriorityUpdate; } + int requestPriorityAtLastPriorityUpdate() const { return m_priorityAtLastPriorityUpdate; } bool wasAbovePriorityCutoffAtLastPriorityUpdate() const { return m_wasAbovePriorityCutoffAtLastPriorityUpdate; } void deleteResource(CCResourceProvider*); |