Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 101 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/FontDescription.cpp b/Source/WebCore/platform/graphics/FontDescription.cpp
new file mode 100644
index 0000000..58ddf81
--- /dev/null
+++ b/Source/WebCore/platform/graphics/FontDescription.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
+ * Copyright (C) 2008 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FontDescription.h"
+
+namespace WebCore {
+
+FontWeight FontDescription::lighterWeight(void) const
+{
+    // FIXME: Should actually return the CSS weight corresponding to next lightest
+    // weight of the currently used font family.
+    switch (m_weight) {
+        case FontWeight100:
+        case FontWeight200:
+            return FontWeight100;
+
+        case FontWeight300:
+            return FontWeight200;
+
+        case FontWeight400:
+        case FontWeight500:
+            return FontWeight300;
+
+        case FontWeight600:
+        case FontWeight700:
+            return FontWeight400;
+
+        case FontWeight800:
+            return FontWeight500;
+
+        case FontWeight900:
+            return FontWeight700;
+    }
+    ASSERT_NOT_REACHED();
+    return FontWeightNormal;
+}
+
+FontWeight FontDescription::bolderWeight(void) const
+{
+    // FIXME: Should actually return the CSS weight corresponding to next heaviest
+    // weight of the currently used font family.
+    switch (m_weight) {
+        case FontWeight100:
+        case FontWeight200:
+            return FontWeight300;
+
+        case FontWeight300:
+            return FontWeight400;
+
+        case FontWeight400:
+        case FontWeight500:
+            return FontWeight700;
+
+        case FontWeight600:
+        case FontWeight700:
+            return FontWeight800;
+
+        case FontWeight800:
+        case FontWeight900:
+            return FontWeight900;
+    }
+    ASSERT_NOT_REACHED();
+    return FontWeightNormal;
+}
+
+FontTraitsMask FontDescription::traitsMask() const
+{
+    return static_cast<FontTraitsMask>((m_italic ? FontStyleItalicMask : FontStyleNormalMask)
+            | (m_smallCaps ? FontVariantSmallCapsMask : FontVariantNormalMask)
+            | (FontWeight100Mask << (m_weight - FontWeight100)));
+    
+}
+
+} // namespace WebCore