Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 67 insertions, 0 deletions

diff --git a/Source/WebCore/css/FontValue.cpp b/Source/WebCore/css/FontValue.cpp
new file mode 100644
index 0000000..991fc6e
--- /dev/null
+++ b/Source/WebCore/css/FontValue.cpp
@@ -0,0 +1,67 @@
+/**
+ * (C) 1999-2003 Lars Knoll (knoll@kde.org)
+ * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#include "config.h"
+#include "FontValue.h"
+
+#include "CSSValueList.h"
+#include "CSSPrimitiveValue.h"
+#include "PlatformString.h"
+
+namespace WebCore {
+
+String FontValue::cssText() const
+{
+    // font variant weight size / line-height family 
+
+    String result("");
+
+    if (style)
+        result += style->cssText();
+    if (variant) {
+        if (!result.isEmpty())
+            result += " ";
+        result += variant->cssText();
+    }
+    if (weight) {
+        if (!result.isEmpty())
+            result += " ";
+        result += weight->cssText();
+    }
+    if (size) {
+        if (!result.isEmpty())
+            result += " ";
+        result += size->cssText();
+    }
+    if (lineHeight) {
+        if (!size)
+            result += " ";
+        result += "/";
+        result += lineHeight->cssText();
+    }
+    if (family) {
+        if (!result.isEmpty())
+            result += " ";
+        result += family->cssText();
+    }
+
+    return result;
+}
+
+}