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

Unified Diff: Source/platform/graphics/paint/DisplayItemList.cpp

Issue 1184943002: Add a release assert that we found a cached item. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/paint/DisplayItemList.cpp
diff --git a/Source/platform/graphics/paint/DisplayItemList.cpp b/Source/platform/graphics/paint/DisplayItemList.cpp
index f5782e990fc17e22d7e54464599c6c4d5d24fa20..b7b083eb3bb888dbf37fff4330ad915223035f09 100644
--- a/Source/platform/graphics/paint/DisplayItemList.cpp
+++ b/Source/platform/graphics/paint/DisplayItemList.cpp
@@ -260,8 +260,12 @@ void DisplayItemList::commitNewDisplayItems()
updatedList.appendByMoving(currentIt);
} else {
DisplayItems::Iterator foundIt = findOutOfOrderCachedItem(currentIt, newDisplayItem.id(), matchingType, displayItemIndicesByClient);
- ASSERT(foundIt != currentEnd);
isSynchronized = (foundIt == currentIt);
+
+ // TODO(chrishtr): downgrade to ASSERT as this goes to beta users, and replace with bailing out of the rest of the merge.
+ // This assert hits if we couldn't find the cached display item in our cache, which should be impossible.
+ RELEASE_ASSERT(foundIt != currentEnd);
+
updatedList.appendByMoving(foundIt);
}
} else {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698