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

Side by Side Diff: third_party/WebKit/Source/core/css/FontFace.h

Issue 2721603005: Convert unnecessary ContextLifecycleObservers into ContextClients. (Closed)
Patch Set: normalize trace method Created 3 years, 9 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 | « no previous file | third_party/WebKit/Source/core/css/FontFace.cpp » ('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 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 class ExceptionState; 52 class ExceptionState;
53 class FontFaceDescriptors; 53 class FontFaceDescriptors;
54 class StringOrArrayBufferOrArrayBufferView; 54 class StringOrArrayBufferOrArrayBufferView;
55 class StylePropertySet; 55 class StylePropertySet;
56 class StyleRuleFontFace; 56 class StyleRuleFontFace;
57 class WebTaskRunner; 57 class WebTaskRunner;
58 58
59 class CORE_EXPORT FontFace : public GarbageCollectedFinalized<FontFace>, 59 class CORE_EXPORT FontFace : public GarbageCollectedFinalized<FontFace>,
60 public ScriptWrappable, 60 public ScriptWrappable,
61 public ActiveScriptWrappable<FontFace>, 61 public ActiveScriptWrappable<FontFace>,
62 public ContextLifecycleObserver { 62 public ContextClient {
63 DEFINE_WRAPPERTYPEINFO(); 63 DEFINE_WRAPPERTYPEINFO();
64 USING_GARBAGE_COLLECTED_MIXIN(FontFace); 64 USING_GARBAGE_COLLECTED_MIXIN(FontFace);
65 WTF_MAKE_NONCOPYABLE(FontFace); 65 WTF_MAKE_NONCOPYABLE(FontFace);
66 66
67 public: 67 public:
68 enum LoadStatusType { Unloaded, Loading, Loaded, Error }; 68 enum LoadStatusType { Unloaded, Loading, Loaded, Error };
69 69
70 static FontFace* create(ExecutionContext*, 70 static FontFace* create(ExecutionContext*,
71 const AtomicString& family, 71 const AtomicString& family,
72 StringOrArrayBufferOrArrayBufferView&, 72 StringOrArrayBufferOrArrayBufferView&,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 Member<LoadedProperty> m_loadedProperty; 179 Member<LoadedProperty> m_loadedProperty;
180 Member<CSSFontFace> m_cssFontFace; 180 Member<CSSFontFace> m_cssFontFace;
181 HeapVector<Member<LoadFontCallback>> m_callbacks; 181 HeapVector<Member<LoadFontCallback>> m_callbacks;
182 }; 182 };
183 183
184 using FontFaceArray = HeapVector<Member<FontFace>>; 184 using FontFaceArray = HeapVector<Member<FontFace>>;
185 185
186 } // namespace blink 186 } // namespace blink
187 187
188 #endif // FontFace_h 188 #endif // FontFace_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698