Upstream version 5.34.104.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 52b17e6..be66125 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebFontDescription.cpp
+++ b/src/third_party/WebKit/Source/web/WebFontDescription.cpp
@@ -35,10 +35,9 @@
 
 using namespace WebCore;
 
-namespace WebKit {
+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());
@@ -47,8 +46,8 @@ WebFontDescription::WebFontDescription(const FontDescription& desc,
     smallCaps = desc.smallCaps();
     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
@@ -65,7 +64,9 @@ WebFontDescription::operator WebCore::FontDescription() const
     desc.setSmallCaps(smallCaps);
     desc.setWeight(static_cast<FontWeight>(weight));
     desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing));
+    desc.setLetterSpacing(letterSpacing);
+    desc.setWordSpacing(wordSpacing);
     return desc;
 }
 
-} // namespace WebKit
+} // namespace blink