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

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

Issue 1634683002: Fix g++ builds by avoiding early HeapSupplement<Document> instantiation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | no next file » | 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 met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
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 12 matching lines...) Expand all
23 * DAMAGE. 23 * DAMAGE.
24 */ 24 */
25 25
26 #ifndef FontFaceSet_h 26 #ifndef FontFaceSet_h
27 #define FontFaceSet_h 27 #define FontFaceSet_h
28 28
29 #include "bindings/core/v8/Iterable.h" 29 #include "bindings/core/v8/Iterable.h"
30 #include "bindings/core/v8/ScriptPromise.h" 30 #include "bindings/core/v8/ScriptPromise.h"
31 #include "core/css/FontFace.h" 31 #include "core/css/FontFace.h"
32 #include "core/dom/ActiveDOMObject.h" 32 #include "core/dom/ActiveDOMObject.h"
33 #include "core/dom/Document.h"
33 #include "core/events/EventListener.h" 34 #include "core/events/EventListener.h"
34 #include "core/events/EventTarget.h" 35 #include "core/events/EventTarget.h"
35 #include "platform/AsyncMethodRunner.h" 36 #include "platform/AsyncMethodRunner.h"
36 #include "platform/RefCountedSupplement.h" 37 #include "platform/RefCountedSupplement.h"
38 #include "platform/heap/Handle.h"
37 #include "wtf/Allocator.h" 39 #include "wtf/Allocator.h"
38 #include "wtf/PassRefPtr.h" 40 #include "wtf/PassRefPtr.h"
39 #include "wtf/RefCounted.h" 41 #include "wtf/RefCounted.h"
40 #include "wtf/Vector.h" 42 #include "wtf/Vector.h"
41 43
42 // Mac OS X 10.6 SDK defines check() macro that interfares with our check() meth od 44 // Mac OS X 10.6 SDK defines check() macro that interfares with our check() meth od
43 #ifdef check 45 #ifdef check
44 #undef check 46 #undef check
45 #endif 47 #endif
46 48
47 namespace blink { 49 namespace blink {
48 50
49 class CSSFontFace; 51 class CSSFontFace;
50 class CSSFontFaceSource; 52 class CSSFontFaceSource;
51 class CSSFontSelector; 53 class CSSFontSelector;
52 class Dictionary; 54 class Dictionary;
53 class Document;
54 class ExceptionState; 55 class ExceptionState;
55 class Font; 56 class Font;
56 class FontFaceCache; 57 class FontFaceCache;
57 class FontResource; 58 class FontResource;
58 class ExecutionContext; 59 class ExecutionContext;
59 60
60 using FontFaceSetIterable = PairIterable<RefPtrWillBeMember<FontFace>, RefPtrWil lBeMember<FontFace>>; 61 using FontFaceSetIterable = PairIterable<RefPtrWillBeMember<FontFace>, RefPtrWil lBeMember<FontFace>>;
61 62
62 #if ENABLE(OILPAN) 63 #if ENABLE(OILPAN)
63 class FontFaceSet final : public EventTargetWithInlineData, public HeapSupplemen t<Document>, public ActiveDOMObject, public FontFaceSetIterable { 64 class FontFaceSet final : public EventTargetWithInlineData, public HeapSupplemen t<Document>, public ActiveDOMObject, public FontFaceSetIterable {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> m_nonCSSConnectedFaces; 177 WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> m_nonCSSConnectedFaces;
177 178
178 PersistentWillBeMember<AsyncMethodRunner<FontFaceSet>> m_asyncRunner; 179 PersistentWillBeMember<AsyncMethodRunner<FontFaceSet>> m_asyncRunner;
179 180
180 FontLoadHistogram m_histogram; 181 FontLoadHistogram m_histogram;
181 }; 182 };
182 183
183 } // namespace blink 184 } // namespace blink
184 185
185 #endif // FontFaceSet_h 186 #endif // FontFaceSet_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698