Changeset 145706 in webkit

Timestamp:

Mar 13, 2013 5:38:08 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] SimpleFontData: remove duplicate code
​https://bugs.webkit.org/show_bug.cgi?id=112149

Patch by Alberto Garcia <​agarcia@igalia.com> on 2013-03-13
Reviewed by Carlos Garcia Campos.

smallCapsFontData() and emphasisMarkFontData() were moved from
platform specific files into platform/graphics/SimpleFontData.cpp
in r133362, so the BlackBerry port no longer needs its own
implementation.

• platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-13  Alberto Garcia  <agarcia@igalia.com>
+
+        [BlackBerry] SimpleFontData: remove duplicate code
+        https://bugs.webkit.org/show_bug.cgi?id=112149
+
+        Reviewed by Carlos Garcia Campos.
+
+        smallCapsFontData() and emphasisMarkFontData() were moved from
+        platform specific files into platform/graphics/SimpleFontData.cpp
+        in r133362, so the BlackBerry port no longer needs its own
+        implementation.
+
+        * platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp:
+
 2013-03-13  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-// Smallcaps versions of fonts are 70% the size of the normal font.
-static const float smallCapsFraction = 0.7f;
-static const float emphasisMarkFraction = .5;
-
 static inline float FSFixedToFloat(FS_FIXED n) { return n / 65536.0; }
 
@@ -121 +117 @@
 }
 
-SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDescription) const
-{
-    if (!m_derivedFontData)
-        m_derivedFontData = DerivedFontData::create(isCustomFont());
-    if (!m_derivedFontData->smallCaps)
-        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, smallCapsFraction);
-
-    return m_derivedFontData->smallCaps.get();
-}
-
-SimpleFontData* SimpleFontData::emphasisMarkFontData(const FontDescription& fontDescription) const
-{
-    if (!m_derivedFontData)
-        m_derivedFontData = DerivedFontData::create(isCustomFont());
-    if (!m_derivedFontData->emphasisMark)
-        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, emphasisMarkFraction);
-
-    return m_derivedFontData->emphasisMark.get();
-}
-
 bool SimpleFontData::containsCharacters(const UChar* characters, int length) const
 {