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

Side by Side Diff: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

Issue 551373002: Remove debug output formatting from GlyphPageTreeNode and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@mergeImplSquash
Patch Set: Rebased on top of FontPlatformData header merge Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « Source/platform/fonts/cocoa/FontPlatformDataCocoa.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved. 2 * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #if OS(WIN) 163 #if OS(WIN)
164 m_paintTextFlags = 0; 164 m_paintTextFlags = 0;
165 m_minSizeForAntiAlias = src.m_minSizeForAntiAlias; 165 m_minSizeForAntiAlias = src.m_minSizeForAntiAlias;
166 m_minSizeForSubpixel = src.m_minSizeForSubpixel; 166 m_minSizeForSubpixel = src.m_minSizeForSubpixel;
167 m_useSubpixelPositioning = src.m_useSubpixelPositioning; 167 m_useSubpixelPositioning = src.m_useSubpixelPositioning;
168 #endif 168 #endif
169 169
170 return *this; 170 return *this;
171 } 171 }
172 172
173 #ifndef NDEBUG
174 String FontPlatformData::description() const
175 {
176 return String();
177 }
178 #endif
179
180 SkFontID FontPlatformData::uniqueID() const 173 SkFontID FontPlatformData::uniqueID() const
181 { 174 {
182 return m_typeface->uniqueID(); 175 return m_typeface->uniqueID();
183 } 176 }
184 177
185 String FontPlatformData::fontFamilyName() const 178 String FontPlatformData::fontFamilyName() const
186 { 179 {
187 // FIXME(crbug.com/326582): come up with a proper way of handling SVG. 180 // FIXME(crbug.com/326582): come up with a proper way of handling SVG.
188 if (!this->typeface()) 181 if (!this->typeface())
189 return ""; 182 return "";
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 218
226 HarfBuzzFace* FontPlatformData::harfBuzzFace() const 219 HarfBuzzFace* FontPlatformData::harfBuzzFace() const
227 { 220 {
228 if (!m_harfBuzzFace) 221 if (!m_harfBuzzFace)
229 m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this ), uniqueID()); 222 m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this ), uniqueID());
230 223
231 return m_harfBuzzFace.get(); 224 return m_harfBuzzFace.get();
232 } 225 }
233 226
234 } // namespace blink 227 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/cocoa/FontPlatformDataCocoa.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698