summaryrefslogtreecommitdiffstats
path: root/content/common/mac
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-29 02:16:24 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-29 02:16:24 +0000
commitcc63025a20cbeb3e6cabfc5fce00f277f20b26e6 (patch)
treeeba94df14cc9052194c625d547e29822449f722e /content/common/mac
parent38f4b74512208bd14ef04bc47a3d88cf13ee8d9c (diff)
downloadchromium_src-cc63025a20cbeb3e6cabfc5fce00f277f20b26e6.zip
chromium_src-cc63025a20cbeb3e6cabfc5fce00f277f20b26e6.tar.gz
chromium_src-cc63025a20cbeb3e6cabfc5fce00f277f20b26e6.tar.bz2
Convert some non-debug logging on content/common to debug logging.
[ Re-land of 107815 ] Review URL: http://codereview.chromium.org/8416055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/mac')
-rw-r--r--content/common/mac/font_descriptor_unittest.mm6
-rw-r--r--content/common/mac/font_loader.mm22
2 files changed, 14 insertions, 14 deletions
diff --git a/content/common/mac/font_descriptor_unittest.mm b/content/common/mac/font_descriptor_unittest.mm
index 7054c22..f3ce5e9 100644
--- a/content/common/mac/font_descriptor_unittest.mm
+++ b/content/common/mac/font_descriptor_unittest.mm
@@ -26,7 +26,7 @@ bool CompareFonts(NSFont* font1, NSFont* font2) {
ATSFontRef id2 = CTFontGetPlatformFont(reinterpret_cast<CTFontRef>(font2), 0);
if (id1 != id2) {
- LOG(ERROR) << "ATSFontRefs for "
+ DLOG(ERROR) << "ATSFontRefs for "
<< [[font1 fontName] UTF8String]
<< " and "
<< [[font2 fontName] UTF8String]
@@ -37,7 +37,7 @@ bool CompareFonts(NSFont* font1, NSFont* font2) {
CGFloat size1 = [font1 pointSize];
CGFloat size2 = [font2 pointSize];
if (size1 != size2) {
- LOG(ERROR) << "font sizes for "
+ DLOG(ERROR) << "font sizes for "
<< [[font1 fontName] UTF8String] << " (" << size1 << ")"
<< "and"
<< [[font2 fontName] UTF8String] << " (" << size2 << ")"
@@ -56,7 +56,7 @@ bool CompareFonts(NSFont* font1, NSFont* font2) {
bool is_italic2 = traits2 & NSItalicFontMask;
if (is_bold1 != is_bold2 || is_italic1 != is_italic2) {
- LOG(ERROR) << "Style information for "
+ DLOG(ERROR) << "Style information for "
<< [[font1 fontName] UTF8String]
<< " and "
<< [[font2 fontName] UTF8String]
diff --git a/content/common/mac/font_loader.mm b/content/common/mac/font_loader.mm
index e62a861..a6bf6f0 100644
--- a/content/common/mac/font_loader.mm
+++ b/content/common/mac/font_loader.mm
@@ -56,9 +56,9 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
base::SharedMemory* font_data,
uint32* font_data_size,
uint32* font_id) {
- CHECK(font_data);
- CHECK(font_data_size);
- CHECK(font_id);
+ DCHECK(font_data);
+ DCHECK(font_data_size);
+ DCHECK(font_id);
*font_data_size = 0;
*font_id = 0;
@@ -67,7 +67,7 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
// Load appropriate NSFont.
if (!font_to_encode) {
- LOG(ERROR) << "Failed to load font " << font_name;
+ DLOG(ERROR) << "Failed to load font " << font_name;
return false;
}
@@ -75,7 +75,7 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
ATSFontRef ats_font =
CTFontGetPlatformFont(reinterpret_cast<CTFontRef>(font_to_encode), NULL);
if (!ats_font) {
- LOG(ERROR) << "Conversion to ATSFontRef failed for " << font_name;
+ DLOG(ERROR) << "Conversion to ATSFontRef failed for " << font_name;
return false;
}
@@ -86,7 +86,7 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
uint32_cant_hold_fontcontainer_ref);
ATSFontContainerRef fontContainer = kATSFontContainerRefUnspecified;
if (ATSFontGetContainer(ats_font, 0, &fontContainer) != noErr) {
- LOG(ERROR) << "Failed to get font container ref for " << font_name;
+ DLOG(ERROR) << "Failed to get font container ref for " << font_name;
return false;
}
@@ -100,7 +100,7 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
// since the font now lives in memory as far as it's concerned.
FSRef font_fsref;
if (ATSFontGetFileReference(ats_font, &font_fsref) != noErr) {
- LOG(ERROR) << "Failed to find font file for " << font_name;
+ DLOG(ERROR) << "Failed to find font file for " << font_name;
return false;
}
FilePath font_path = FilePath(base::mac::PathFromFSRef(font_fsref));
@@ -108,18 +108,18 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
// Load file into shared memory buffer.
int64 font_file_size_64 = -1;
if (!file_util::GetFileSize(font_path, &font_file_size_64)) {
- LOG(ERROR) << "Couldn't get font file size for " << font_path.value();
+ DLOG(ERROR) << "Couldn't get font file size for " << font_path.value();
return false;
}
if (font_file_size_64 <= 0 || font_file_size_64 >= kint32max) {
- LOG(ERROR) << "Bad size for font file " << font_path.value();
+ DLOG(ERROR) << "Bad size for font file " << font_path.value();
return false;
}
int32 font_file_size_32 = static_cast<int32>(font_file_size_64);
if (!font_data->CreateAndMapAnonymous(font_file_size_32)) {
- LOG(ERROR) << "Failed to create shmem area for " << font_name;
+ DLOG(ERROR) << "Failed to create shmem area for " << font_name;
return false;
}
@@ -127,7 +127,7 @@ bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
reinterpret_cast<char*>(font_data->memory()),
font_file_size_32);
if (amt_read != font_file_size_32) {
- LOG(ERROR) << "Failed to read font data for " << font_path.value();
+ DLOG(ERROR) << "Failed to read font data for " << font_path.value();
return false;
}