Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: cc/prioritized_resource.cc

Issue 11411251: Use a lock to deal with concurrent access to the m_evictedBackings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make lock mutable Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/prioritized_resource.h ('k') | cc/prioritized_resource_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/prioritized_resource.cc
diff --git a/cc/prioritized_resource.cc b/cc/prioritized_resource.cc
index ebc8378229575cf4c7e96f68c3f66a7bc0889a58..5f252c041e7bba490f100cd8d939c514b673b0f7 100644
--- a/cc/prioritized_resource.cc
+++ b/cc/prioritized_resource.cc
@@ -107,8 +107,8 @@ void PrioritizedResource::setPixels(ResourceProvider* resourceProvider,
void PrioritizedResource::link(Backing* backing)
{
DCHECK(backing);
- CHECK(!backing->m_owner);
- CHECK(!m_backing);
+ DCHECK(!backing->m_owner);
+ DCHECK(!m_backing);
m_backing = backing;
m_backing->m_owner = this;
@@ -117,7 +117,7 @@ void PrioritizedResource::link(Backing* backing)
void PrioritizedResource::unlink()
{
DCHECK(m_backing);
- CHECK(m_backing->m_owner == this);
+ DCHECK(m_backing->m_owner == this);
m_backing->m_owner = 0;
m_backing = 0;
@@ -137,7 +137,6 @@ PrioritizedResource::Backing::Backing(unsigned id, ResourceProvider* resourcePro
, m_wasAbovePriorityCutoffAtLastPriorityUpdate(false)
, m_inDrawingImplTree(false)
, m_resourceHasBeenDeleted(false)
- , m_inMainThreadEvictedList(false)
#ifndef NDEBUG
, m_resourceProvider(resourceProvider)
#endif
@@ -148,7 +147,6 @@ PrioritizedResource::Backing::~Backing()
{
DCHECK(!m_owner);
DCHECK(m_resourceHasBeenDeleted);
- CHECK(!m_inMainThreadEvictedList);
}
void PrioritizedResource::Backing::deleteResource(ResourceProvider* resourceProvider)
« no previous file with comments | « cc/prioritized_resource.h ('k') | cc/prioritized_resource_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698