| 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 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #ifndef FontFaceSet_h | 26 #ifndef FontFaceSet_h |
| 27 #define FontFaceSet_h | 27 #define FontFaceSet_h |
| 28 | 28 |
| 29 #include "bindings/v8/ScriptPromise.h" | 29 #include "bindings/v8/ScriptPromise.h" |
| 30 #include "core/css/FontFace.h" | 30 #include "core/css/FontFace.h" |
| 31 #include "core/css/FontFaceSetForEachCallback.h" | 31 #include "core/css/FontFaceSetForEachCallback.h" |
| 32 #include "core/dom/ActiveDOMObject.h" | 32 #include "core/dom/ActiveDOMObject.h" |
| 33 #include "core/events/EventListener.h" | 33 #include "core/events/EventListener.h" |
| 34 #include "core/events/EventTarget.h" | 34 #include "core/events/EventTarget.h" |
| 35 #include "core/events/ThreadLocalEventNames.h" | |
| 36 #include "platform/AsyncMethodRunner.h" | 35 #include "platform/AsyncMethodRunner.h" |
| 37 #include "platform/RefCountedSupplement.h" | 36 #include "platform/RefCountedSupplement.h" |
| 38 #include "wtf/PassRefPtr.h" | 37 #include "wtf/PassRefPtr.h" |
| 39 #include "wtf/RefCounted.h" | 38 #include "wtf/RefCounted.h" |
| 40 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
| 41 | 40 |
| 42 // 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 |
| 43 #ifdef check | 42 #ifdef check |
| 44 #undef check | 43 #undef check |
| 45 #endif | 44 #endif |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 ListHashSet<RefPtr<FontFace> > m_nonCSSConnectedFaces; | 146 ListHashSet<RefPtr<FontFace> > m_nonCSSConnectedFaces; |
| 148 | 147 |
| 149 AsyncMethodRunner<FontFaceSet> m_asyncRunner; | 148 AsyncMethodRunner<FontFaceSet> m_asyncRunner; |
| 150 | 149 |
| 151 FontLoadHistogram m_histogram; | 150 FontLoadHistogram m_histogram; |
| 152 }; | 151 }; |
| 153 | 152 |
| 154 } // namespace WebCore | 153 } // namespace WebCore |
| 155 | 154 |
| 156 #endif // FontFaceSet_h | 155 #endif // FontFaceSet_h |
| OLD | NEW |