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

Side by Side Diff: include/core/SkTypeface.h

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT Created 5 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 | « include/core/SkTDArray.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | 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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkTypeface_DEFINED 10 #ifndef SkTypeface_DEFINED
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 int32_t adjustments[]) const; 256 int32_t adjustments[]) const;
257 257
258 struct LocalizedString { 258 struct LocalizedString {
259 SkString fString; 259 SkString fString;
260 SkString fLanguage; 260 SkString fLanguage;
261 }; 261 };
262 class LocalizedStrings : ::SkNoncopyable { 262 class LocalizedStrings : ::SkNoncopyable {
263 public: 263 public:
264 virtual ~LocalizedStrings() { } 264 virtual ~LocalizedStrings() { }
265 virtual bool next(LocalizedString* localizedString) = 0; 265 virtual bool next(LocalizedString* localizedString) = 0;
266 void unref() { SkDELETE(this); } 266 void unref() { delete this; }
267 }; 267 };
268 /** 268 /**
269 * Returns an iterator which will attempt to enumerate all of the 269 * Returns an iterator which will attempt to enumerate all of the
270 * family names specified by the font. 270 * family names specified by the font.
271 * It is the caller's responsibility to unref() the returned pointer. 271 * It is the caller's responsibility to unref() the returned pointer.
272 */ 272 */
273 LocalizedStrings* createFamilyNameIterator() const; 273 LocalizedStrings* createFamilyNameIterator() const;
274 274
275 /** 275 /**
276 * Return the family name for this typeface. It will always be returned 276 * Return the family name for this typeface. It will always be returned
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 SkFontStyle fStyle; 410 SkFontStyle fStyle;
411 bool fIsFixedPitch; 411 bool fIsFixedPitch;
412 412
413 friend class SkPaint; 413 friend class SkPaint;
414 friend class SkGlyphCache; // GetDefaultTypeface 414 friend class SkGlyphCache; // GetDefaultTypeface
415 415
416 typedef SkWeakRefCnt INHERITED; 416 typedef SkWeakRefCnt INHERITED;
417 }; 417 };
418 418
419 #endif 419 #endif
OLDNEW
« no previous file with comments | « include/core/SkTDArray.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698