| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 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" | |
| 32 #include "sky/engine/public/web/WebFontDescription.h" | 31 #include "sky/engine/public/web/WebFontDescription.h" |
| 33 | 32 |
| 34 #include "sky/engine/platform/fonts/FontDescription.h" | 33 #include "sky/engine/platform/fonts/FontDescription.h" |
| 35 | 34 |
| 36 namespace blink { | 35 namespace blink { |
| 37 | 36 |
| 38 WebFontDescription::WebFontDescription(const FontDescription& desc) | 37 WebFontDescription::WebFontDescription(const FontDescription& desc) |
| 39 { | 38 { |
| 40 family = desc.family().family(); | 39 family = desc.family().family(); |
| 41 genericFamily = static_cast<GenericFamily>(desc.genericFamily()); | 40 genericFamily = static_cast<GenericFamily>(desc.genericFamily()); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 61 desc.setStyle(italic ? FontStyleItalic : FontStyleNormal); | 60 desc.setStyle(italic ? FontStyleItalic : FontStyleNormal); |
| 62 desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal); | 61 desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal); |
| 63 desc.setWeight(static_cast<FontWeight>(weight)); | 62 desc.setWeight(static_cast<FontWeight>(weight)); |
| 64 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing)); | 63 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing)); |
| 65 desc.setLetterSpacing(letterSpacing); | 64 desc.setLetterSpacing(letterSpacing); |
| 66 desc.setWordSpacing(wordSpacing); | 65 desc.setWordSpacing(wordSpacing); |
| 67 return desc; | 66 return desc; |
| 68 } | 67 } |
| 69 | 68 |
| 70 } // namespace blink | 69 } // namespace blink |
| OLD | NEW |