third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp - Issue 2858963002: Replace ASSERT with DCHECK in core/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp

Issue 2858963002: Replace ASSERT with DCHECK in core/ (Closed)

Patch Set: WorkerBackingThread Created 3 years, 7 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 | « third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp ('k') | third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp

diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp

index b10ef084d7aed00b4e6b6b16dae35fe386b0c581..f855d4768eef17e1eab4f1ee01cbf7b6e332b504 100644

--- a/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp

+++ b/third_party/WebKit/Source/core/html/canvas/CanvasFontCache.cpp

@@ -58,7 +58,7 @@ bool CanvasFontCache::GetFontUsingDefaultStyle(const String& font_string,

HashMap<String, Font>::iterator i =

fonts_resolved_using_default_style_.find(font_string);

if (i != fonts_resolved_using_default_style_.end()) {

- ASSERT(font_lru_list_.Contains(font_string));

+ DCHECK(font_lru_list_.Contains(font_string));

font_lru_list_.erase(font_string);

font_lru_list_.insert(font_string);

resolved_font = i->value;

@@ -83,7 +83,7 @@ MutableStylePropertySet* CanvasFontCache::ParseFont(const String& font_string) {

MutableStylePropertySet* parsed_style;

MutableStylePropertyMap::iterator i = fetched_fonts_.find(font_string);

if (i != fetched_fonts_.end()) {

- ASSERT(font_lru_list_.Contains(font_string));

+ DCHECK(font_lru_list_.Contains(font_string));

parsed_style = i->value;

font_lru_list_.erase(font_string);

font_lru_list_.insert(font_string);

@@ -118,8 +118,8 @@ MutableStylePropertySet* CanvasFontCache::ParseFont(const String& font_string) {

}

void CanvasFontCache::DidProcessTask() {

- ASSERT(pruning_scheduled_);

- ASSERT(main_cache_purge_preventer_);

+ DCHECK(pruning_scheduled_);

+ DCHECK(main_cache_purge_preventer_);

while (fetched_fonts_.size() > MaxFonts()) {

fetched_fonts_.erase(font_lru_list_.front());

fonts_resolved_using_default_style_.erase(font_lru_list_.front());

@@ -133,7 +133,7 @@ void CanvasFontCache::DidProcessTask() {

void CanvasFontCache::SchedulePruningIfNeeded() {

if (pruning_scheduled_)

return;

- ASSERT(!main_cache_purge_preventer_);

+ DCHECK(!main_cache_purge_preventer_);

main_cache_purge_preventer_ = WTF::WrapUnique(new FontCachePurgePreventer);

Platform::Current()->CurrentThread()->AddTaskObserver(this);

pruning_scheduled_ = true;