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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

Issue 1860903002: Update Source/platform/ to assume Oilpan only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back out ScrollAnimatorMac() accidental change Created 4 years, 8 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) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 : m_pageZero(0) 43 : m_pageZero(0)
44 , m_cachedPrimarySimpleFontData(0) 44 , m_cachedPrimarySimpleFontData(0)
45 , m_fontSelector(nullptr) 45 , m_fontSelector(nullptr)
46 , m_fontSelectorVersion(0) 46 , m_fontSelectorVersion(0)
47 , m_familyIndex(0) 47 , m_familyIndex(0)
48 , m_generation(FontCache::fontCache()->generation()) 48 , m_generation(FontCache::fontCache()->generation())
49 , m_hasLoadingFallback(false) 49 , m_hasLoadingFallback(false)
50 { 50 {
51 } 51 }
52 52
53 void FontFallbackList::invalidate(RawPtr<FontSelector> fontSelector) 53 void FontFallbackList::invalidate(FontSelector* fontSelector)
54 { 54 {
55 releaseFontData(); 55 releaseFontData();
56 m_fontList.clear(); 56 m_fontList.clear();
57 m_pageZero = 0; 57 m_pageZero = 0;
58 m_pages.clear(); 58 m_pages.clear();
59 m_cachedPrimarySimpleFontData = 0; 59 m_cachedPrimarySimpleFontData = 0;
60 m_familyIndex = 0; 60 m_familyIndex = 0;
61 m_hasLoadingFallback = false; 61 m_hasLoadingFallback = false;
62 if (m_fontSelector != fontSelector) 62 if (m_fontSelector != fontSelector)
63 m_fontSelector = fontSelector; 63 m_fontSelector = fontSelector;
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 bool FontFallbackList::isValid() const 232 bool FontFallbackList::isValid() const
233 { 233 {
234 if (!m_fontSelector) 234 if (!m_fontSelector)
235 return m_fontSelectorVersion == 0; 235 return m_fontSelectorVersion == 0;
236 236
237 return m_fontSelector->version() == m_fontSelectorVersion; 237 return m_fontSelector->version() == m_fontSelectorVersion;
238 } 238 }
239 239
240 } // namespace blink 240 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698