| 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 | 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef FontFace_h | 31 #ifndef FontFace_h |
| 32 #define FontFace_h | 32 #define FontFace_h |
| 33 | 33 |
| 34 #include "CSSPropertyNames.h" | |
| 35 #include "bindings/v8/ScriptPromise.h" | 34 #include "bindings/v8/ScriptPromise.h" |
| 35 #include "core/CSSPropertyNames.h" |
| 36 #include "core/css/CSSValue.h" | 36 #include "core/css/CSSValue.h" |
| 37 #include "core/dom/DOMError.h" | 37 #include "core/dom/DOMError.h" |
| 38 #include "platform/fonts/FontTraits.h" | 38 #include "platform/fonts/FontTraits.h" |
| 39 #include "wtf/PassRefPtr.h" | 39 #include "wtf/PassRefPtr.h" |
| 40 #include "wtf/RefCounted.h" | 40 #include "wtf/RefCounted.h" |
| 41 #include "wtf/text/WTFString.h" | 41 #include "wtf/text/WTFString.h" |
| 42 | 42 |
| 43 namespace WebCore { | 43 namespace WebCore { |
| 44 | 44 |
| 45 class CSSFontFace; | 45 class CSSFontFace; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers; | 130 Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers; |
| 131 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace; | 131 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace; |
| 132 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback> > m_callbacks; | 132 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback> > m_callbacks; |
| 133 }; | 133 }; |
| 134 | 134 |
| 135 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace> > FontFaceArray; | 135 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace> > FontFaceArray; |
| 136 | 136 |
| 137 } // namespace WebCore | 137 } // namespace WebCore |
| 138 | 138 |
| 139 #endif // FontFace_h | 139 #endif // FontFace_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 331633003:
Qualify the generated includes in core (partial). (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master