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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp

Issue 2392343005: Reflow comments in core/css (Closed)
Patch Set: Revert clang-format Created 4 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2010, 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // If the font hasn't loaded or an error occurred, then we've got nothing. 42 // If the font hasn't loaded or an error occurred, then we've got nothing.
43 if (!isValid()) 43 if (!isValid())
44 return nullptr; 44 return nullptr;
45 45
46 if (isLocal()) { 46 if (isLocal()) {
47 // We're local. Just return a SimpleFontData from the normal cache. 47 // We're local. Just return a SimpleFontData from the normal cache.
48 return createFontData(fontDescription); 48 return createFontData(fontDescription);
49 } 49 }
50 50
51 // See if we have a mapping in our FontData cache. 51 // See if we have a mapping in our FontData cache.
52 // TODO(drott): Check whether losing traits information here is problematic. c rbug.com/516677 52 // TODO(drott): Check whether losing traits information here is problematic.
53 // crbug.com/516677
53 FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams()); 54 FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams());
54 55
55 RefPtr<SimpleFontData>& fontData = 56 RefPtr<SimpleFontData>& fontData =
56 m_fontDataTable.add(key, nullptr).storedValue->value; 57 m_fontDataTable.add(key, nullptr).storedValue->value;
57 if (!fontData) 58 if (!fontData)
58 fontData = createFontData(fontDescription); 59 fontData = createFontData(fontDescription);
59 return fontData; // No release, because fontData is a reference to a RefPtr t hat is held in the m_fontDataTable. 60 // No release, because fontData is a reference to a RefPtr that is held in the
61 // m_fontDataTable.
62 return fontData;
60 } 63 }
61 64
62 DEFINE_TRACE(CSSFontFaceSource) { 65 DEFINE_TRACE(CSSFontFaceSource) {
63 visitor->trace(m_face); 66 visitor->trace(m_face);
64 } 67 }
65 68
66 } // namespace blink 69 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698