| 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 15 matching lines...) Expand all Loading... |
| 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 "config.h" | 31 #include "config.h" |
| 32 #include "public/web/WebFontDescription.h" | 32 #include "public/web/WebFontDescription.h" |
| 33 | 33 |
| 34 #include "platform/fonts/FontDescription.h" | 34 #include "platform/fonts/FontDescription.h" |
| 35 | 35 |
| 36 using namespace WebCore; | 36 using namespace blink; |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 WebFontDescription::WebFontDescription(const FontDescription& desc) | 40 WebFontDescription::WebFontDescription(const FontDescription& desc) |
| 41 { | 41 { |
| 42 family = desc.family().family(); | 42 family = desc.family().family(); |
| 43 genericFamily = static_cast<GenericFamily>(desc.genericFamily()); | 43 genericFamily = static_cast<GenericFamily>(desc.genericFamily()); |
| 44 size = desc.specifiedSize(); | 44 size = desc.specifiedSize(); |
| 45 italic = desc.style() == FontStyleItalic; | 45 italic = desc.style() == FontStyleItalic; |
| 46 smallCaps = desc.variant() == FontVariantSmallCaps; | 46 smallCaps = desc.variant() == FontVariantSmallCaps; |
| 47 weight = static_cast<Weight>(desc.weight()); | 47 weight = static_cast<Weight>(desc.weight()); |
| 48 smoothing = static_cast<Smoothing>(desc.fontSmoothing()); | 48 smoothing = static_cast<Smoothing>(desc.fontSmoothing()); |
| 49 letterSpacing = desc.letterSpacing(); | 49 letterSpacing = desc.letterSpacing(); |
| 50 wordSpacing = desc.wordSpacing(); | 50 wordSpacing = desc.wordSpacing(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 WebFontDescription::operator WebCore::FontDescription() const | 53 WebFontDescription::operator blink::FontDescription() const |
| 54 { | 54 { |
| 55 FontFamily fontFamily; | 55 FontFamily fontFamily; |
| 56 fontFamily.setFamily(family); | 56 fontFamily.setFamily(family); |
| 57 | 57 |
| 58 FontDescription desc; | 58 FontDescription desc; |
| 59 desc.setFamily(fontFamily); | 59 desc.setFamily(fontFamily); |
| 60 desc.setGenericFamily(static_cast<FontDescription::GenericFamilyType>(generi
cFamily)); | 60 desc.setGenericFamily(static_cast<FontDescription::GenericFamilyType>(generi
cFamily)); |
| 61 desc.setSpecifiedSize(size); | 61 desc.setSpecifiedSize(size); |
| 62 desc.setComputedSize(size); | 62 desc.setComputedSize(size); |
| 63 desc.setStyle(italic ? FontStyleItalic : FontStyleNormal); | 63 desc.setStyle(italic ? FontStyleItalic : FontStyleNormal); |
| 64 desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal); | 64 desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal); |
| 65 desc.setWeight(static_cast<FontWeight>(weight)); | 65 desc.setWeight(static_cast<FontWeight>(weight)); |
| 66 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing)); | 66 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing)); |
| 67 desc.setLetterSpacing(letterSpacing); | 67 desc.setLetterSpacing(letterSpacing); |
| 68 desc.setWordSpacing(wordSpacing); | 68 desc.setWordSpacing(wordSpacing); |
| 69 return desc; | 69 return desc; |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace blink | 72 } // namespace blink |
| OLD | NEW |