Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebFontDescription.cpp

diff --git a/src/third_party/WebKit/Source/web/WebFontDescription.cpp b/src/third_party/WebKit/Source/web/WebFontDescription.cpp
index 30fcc6f..952a5f0 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebFontDescription.cpp
+++ b/src/third_party/WebKit/Source/web/WebFontDescription.cpp
@@ -29,29 +29,26 @@
  */
 
 #include "config.h"
-#include "WebFontDescription.h"
+#include "public/web/WebFontDescription.h"
 
 #include "platform/fonts/FontDescription.h"
 
-using namespace WebCore;
-
 namespace blink {
 
-WebFontDescription::WebFontDescription(const FontDescription& desc,
-                                       short fontLetterSpacing, short fontWordSpacing)
+WebFontDescription::WebFontDescription(const FontDescription& desc)
 {
     family = desc.family().family();
     genericFamily = static_cast<GenericFamily>(desc.genericFamily());
     size = desc.specifiedSize();
-    italic = desc.italic();
-    smallCaps = desc.smallCaps();
+    italic = desc.style() == FontStyleItalic;
+    smallCaps = desc.variant() == FontVariantSmallCaps;
     weight = static_cast<Weight>(desc.weight());
     smoothing = static_cast<Smoothing>(desc.fontSmoothing());
-    letterSpacing = fontLetterSpacing;
-    wordSpacing = fontWordSpacing;
+    letterSpacing = desc.letterSpacing();
+    wordSpacing = desc.wordSpacing();
 }
 
-WebFontDescription::operator WebCore::FontDescription() const
+WebFontDescription::operator FontDescription() const
 {
     FontFamily fontFamily;
     fontFamily.setFamily(family);
@@ -61,10 +58,12 @@ WebFontDescription::operator WebCore::FontDescription() const
     desc.setGenericFamily(static_cast<FontDescription::GenericFamilyType>(genericFamily));
     desc.setSpecifiedSize(size);
     desc.setComputedSize(size);
-    desc.setItalic(italic);
-    desc.setSmallCaps(smallCaps);
+    desc.setStyle(italic ? FontStyleItalic : FontStyleNormal);
+    desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal);
     desc.setWeight(static_cast<FontWeight>(weight));
     desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing));
+    desc.setLetterSpacing(letterSpacing);
+    desc.setWordSpacing(wordSpacing);
     return desc;
 }