| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (c) 2006, 2007, 2008, 2009 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 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 #include "sky/engine/config.h" | 31 #include "sky/engine/config.h" |
| 32 | 32 |
| 33 #if !OS(WIN) && !OS(ANDROID) | |
| 34 #include "third_party/skia/include/ports/SkFontConfigInterface.h" | |
| 35 #endif | |
| 36 #include <unicode/locid.h> | 33 #include <unicode/locid.h> |
| 37 #include "sky/engine/platform/NotImplemented.h" | 34 #include "sky/engine/platform/NotImplemented.h" |
| 38 #include "sky/engine/platform/fonts/AlternateFontFamily.h" | 35 #include "sky/engine/platform/fonts/AlternateFontFamily.h" |
| 39 #include "sky/engine/platform/fonts/FontCache.h" | 36 #include "sky/engine/platform/fonts/FontCache.h" |
| 40 #include "sky/engine/platform/fonts/FontDescription.h" | 37 #include "sky/engine/platform/fonts/FontDescription.h" |
| 41 #include "sky/engine/platform/fonts/FontFaceCreationParams.h" | 38 #include "sky/engine/platform/fonts/FontFaceCreationParams.h" |
| 42 #include "sky/engine/platform/fonts/SimpleFontData.h" | 39 #include "sky/engine/platform/fonts/SimpleFontData.h" |
| 43 #include "sky/engine/public/platform/Platform.h" | 40 #include "sky/engine/public/platform/Platform.h" |
| 44 #include "sky/engine/public/platform/linux/WebSandboxSupport.h" | 41 #include "sky/engine/public/platform/linux/WebSandboxSupport.h" |
| 45 #include "sky/engine/wtf/Assertions.h" | 42 #include "sky/engine/wtf/Assertions.h" |
| 46 #include "sky/engine/wtf/text/AtomicString.h" | 43 #include "sky/engine/wtf/text/AtomicString.h" |
| 47 #include "sky/engine/wtf/text/CString.h" | 44 #include "sky/engine/wtf/text/CString.h" |
| 48 #include "third_party/skia/include/core/SkStream.h" | 45 #include "third_party/skia/include/core/SkStream.h" |
| 49 #include "third_party/skia/include/core/SkTypeface.h" | 46 #include "third_party/skia/include/core/SkTypeface.h" |
| 50 #include "third_party/skia/include/ports/SkFontMgr.h" | 47 #include "third_party/skia/include/ports/SkFontMgr.h" |
| 51 | 48 |
| 49 #if !OS(WIN) && !OS(ANDROID) |
| 50 #include "third_party/skia/include/ports/SkFontConfigInterface.h" |
| 51 #endif |
| 52 |
| 52 #if !OS(WIN) && !OS(ANDROID) && !OS(IOS) | 53 #if !OS(WIN) && !OS(ANDROID) && !OS(IOS) |
| 53 // TODO(bungeman) remove this temporary code ASAP. | 54 // TODO(bungeman) remove this temporary code ASAP. |
| 54 // This namespace exists to ease transition of SkTypeface from using SkStream to
SkStreamAsset. | 55 // This namespace exists to ease transition of SkTypeface from using SkStream to
SkStreamAsset. |
| 55 namespace tmp { | 56 namespace tmp { |
| 56 // Like std::declval but only returns lvalue references, ok since it isn't used
on rvalue references. | 57 // Like std::declval but only returns lvalue references, ok since it isn't used
on rvalue references. |
| 57 template<typename T> T& declvall(); | 58 template<typename T> T& declvall(); |
| 58 // The return type of SkFontConfigInterface::openStream(const SkFontConfigInterf
ace::FontIdentity&). | 59 // The return type of SkFontConfigInterface::openStream(const SkFontConfigInterf
ace::FontIdentity&). |
| 59 using StreamType = decltype(tmp::declvall<SkFontConfigInterface>().openStream(tm
p::declvall<const SkFontConfigInterface::FontIdentity&>())); | 60 using StreamType = decltype(tmp::declvall<SkFontConfigInterface>().openStream(tm
p::declvall<const SkFontConfigInterface::FontIdentity&>())); |
| 60 } | 61 } |
| 61 static tmp::StreamType streamForFontconfigInterfaceId(int fontconfigInterfaceId) | 62 static tmp::StreamType streamForFontconfigInterfaceId(int fontconfigInterfaceId) |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 fontSize, | 274 fontSize, |
| 274 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), | 275 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), |
| 275 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), | 276 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), |
| 276 fontDescription.orientation(), | 277 fontDescription.orientation(), |
| 277 fontDescription.useSubpixelPositioning()); | 278 fontDescription.useSubpixelPositioning()); |
| 278 return result; | 279 return result; |
| 279 } | 280 } |
| 280 #endif // !OS(WIN) | 281 #endif // !OS(WIN) |
| 281 | 282 |
| 282 } // namespace blink | 283 } // namespace blink |
| OLD | NEW |