| OLD | NEW |
| 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 18 matching lines...) Expand all Loading... |
| 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/dom/Document.h" |
| 34 #include "core/events/EventListener.h" | 34 #include "core/events/EventListener.h" |
| 35 #include "core/events/EventTarget.h" | 35 #include "core/events/EventTarget.h" |
| 36 #include "platform/AsyncMethodRunner.h" | 36 #include "platform/AsyncMethodRunner.h" |
| 37 #include "platform/heap/Handle.h" | 37 #include "platform/heap/Handle.h" |
| 38 #include "wtf/Allocator.h" | 38 #include "wtf/Allocator.h" |
| 39 #include "wtf/PassRefPtr.h" | |
| 40 #include "wtf/RefCounted.h" | |
| 41 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
| 42 | 40 |
| 43 // Mac OS X 10.6 SDK defines check() macro that interfares with our check() meth
od | 41 // Mac OS X 10.6 SDK defines check() macro that interfares with our check() meth
od |
| 44 #ifdef check | 42 #ifdef check |
| 45 #undef check | 43 #undef check |
| 46 #endif | 44 #endif |
| 47 | 45 |
| 48 namespace blink { | 46 namespace blink { |
| 49 | 47 |
| 50 class CSSFontFace; | 48 class CSSFontFace; |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 HeapListHashSet<Member<FontFace>> m_nonCSSConnectedFaces; | 167 HeapListHashSet<Member<FontFace>> m_nonCSSConnectedFaces; |
| 170 | 168 |
| 171 Member<AsyncMethodRunner<FontFaceSet>> m_asyncRunner; | 169 Member<AsyncMethodRunner<FontFaceSet>> m_asyncRunner; |
| 172 | 170 |
| 173 FontLoadHistogram m_histogram; | 171 FontLoadHistogram m_histogram; |
| 174 }; | 172 }; |
| 175 | 173 |
| 176 } // namespace blink | 174 } // namespace blink |
| 177 | 175 |
| 178 #endif // FontFaceSet_h | 176 #endif // FontFaceSet_h |
| OLD | NEW |