skia/ext/SkFontHost_fontconfig_direct.cpp - Issue 12771003: Revert 187283

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: skia/ext/SkFontHost_fontconfig_direct.cpp

Issue 12771003: Revert 187283 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 9 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:

« no previous file with comments | « skia/ext/SkFontHost_fontconfig_direct.h ('k') | skia/ext/SkFontHost_fontconfig_impl.h » ('j') | no next file with comments »

OLD	NEW
1 /* libs/graphics/ports/SkFontHost_fontconfig_direct.cpp	1 /* libs/graphics/ports/SkFontHost_fontconfig_direct.cpp

2 **	2 **

3 ** Copyright 2009, Google Inc.	3 ** Copyright 2009, Google Inc.

4 **	4 **

5 ** Licensed under the Apache License, Version 2.0 (the "License");	5 ** Licensed under the Apache License, Version 2.0 (the "License");

6 ** you may not use this file except in compliance with the License.	6 ** you may not use this file except in compliance with the License.

7 ** You may obtain a copy of the License at	7 ** You may obtain a copy of the License at

8 **	8 **

9 ** http://www.apache.org/licenses/LICENSE-2.0	9 ** http://www.apache.org/licenses/LICENSE-2.0

10 **	10 **

(...skipping 484 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
495	495

496 int FontConfigDirect::Open(unsigned filefaceid) {	496 int FontConfigDirect::Open(unsigned filefaceid) {

497 SkAutoMutexAcquire ac(mutex_);	497 SkAutoMutexAcquire ac(mutex_);

498 const std::map<unsigned, std::string>::const_iterator	498 const std::map<unsigned, std::string>::const_iterator

499 i = fileid_to_filename_.find(FileFaceIdToFileId(filefaceid));	499 i = fileid_to_filename_.find(FileFaceIdToFileId(filefaceid));

500 if (i == fileid_to_filename_.end())	500 if (i == fileid_to_filename_.end())

501 return -1;	501 return -1;

502	502

503 return open(i->second.c_str(), O_RDONLY);	503 return open(i->second.c_str(), O_RDONLY);

504 }	504 }

OLD	NEW