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

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

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make patch applicable Created 5 years, 1 month 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 25 matching lines...) Expand all
36 36
37 CSSFontFaceSource::CSSFontFaceSource() 37 CSSFontFaceSource::CSSFontFaceSource()
38 : m_face(nullptr) 38 : m_face(nullptr)
39 { 39 {
40 } 40 }
41 41
42 CSSFontFaceSource::~CSSFontFaceSource() 42 CSSFontFaceSource::~CSSFontFaceSource()
43 { 43 {
44 } 44 }
45 45
46 void CSSFontFaceSource::setFontFace(CSSFontFace* face)
47 {
48 m_face = face;
49 }
50
51 PassRefPtr<SimpleFontData> CSSFontFaceSource::getFontData(const FontDescription& fontDescription) 46 PassRefPtr<SimpleFontData> CSSFontFaceSource::getFontData(const FontDescription& fontDescription)
52 { 47 {
53 // If the font hasn't loaded or an error occurred, then we've got nothing. 48 // If the font hasn't loaded or an error occurred, then we've got nothing.
54 if (!isValid()) 49 if (!isValid())
55 return nullptr; 50 return nullptr;
56 51
57 if (isLocal()) { 52 if (isLocal()) {
58 // We're local. Just return a SimpleFontData from the normal cache. 53 // We're local. Just return a SimpleFontData from the normal cache.
59 return createFontData(fontDescription); 54 return createFontData(fontDescription);
60 } 55 }
61 56
62 // See if we have a mapping in our FontData cache. 57 // See if we have a mapping in our FontData cache.
63 // TODO(drott): Check whether losing traits information here is problematic. crbug.com/516677 58 // TODO(drott): Check whether losing traits information here is problematic. crbug.com/516677
64 FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams()); 59 FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams());
65 60
66 RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(key.hash(), nullptr). storedValue->value; 61 RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(key.hash(), nullptr). storedValue->value;
67 if (!fontData) 62 if (!fontData)
68 fontData = createFontData(fontDescription); 63 fontData = createFontData(fontDescription);
69 return fontData; // No release, because fontData is a reference to a RefPtr that is held in the m_fontDataTable. 64 return fontData; // No release, because fontData is a reference to a RefPtr that is held in the m_fontDataTable.
70 } 65 }
71 66
72 DEFINE_TRACE(CSSFontFaceSource) 67 DEFINE_TRACE(CSSFontFaceSource)
73 { 68 {
74 visitor->trace(m_face); 69 visitor->trace(m_face);
75 } 70 }
76 71
77 } 72 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSFontFaceSource.h ('k') | third_party/WebKit/Source/core/css/CSSImageValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698