Modified: trunk/Source/WebCore/ChangeLog (200137 => 200138)
--- trunk/Source/WebCore/ChangeLog 2016-04-27 18:57:56 UTC (rev 200137)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 18:59:52 UTC (rev 200138)
@@ -1,3 +1,29 @@
+2016-04-27 Myles C. Maxfield <[email protected]>
+
+ Rename DerivedFontData to DerivedFonts
+ https://bugs.webkit.org/show_bug.cgi?id=157092
+
+ Reviewed by Darin Adler.
+
+ This is a follow-up to r178510 where we named SimpleFontData to Font.
+ This patch didn't include renaming DerivedFontData to DerivedFonts.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::verticalRightOrientationFont):
+ (WebCore::Font::uprightOrientationFont):
+ (WebCore::Font::smallCapsFont):
+ (WebCore::Font::noSynthesizableFeaturesFont):
+ (WebCore::Font::emphasisMarkFont):
+ (WebCore::Font::brokenIdeographFont):
+ (WebCore::Font::nonSyntheticItalicFont):
+ (WebCore::Font::DerivedFonts::~DerivedFonts):
+ (WebCore::Font::DerivedFontData::~DerivedFontData): Deleted.
+ * platform/graphics/Font.h:
+ (WebCore::Font::DerivedFonts::DerivedFonts):
+ (WebCore::Font::DerivedFontData::DerivedFontData): Deleted.
+
2016-04-27 Chris Dumez <[email protected]>
[Web IDL] Clean up support for [Clamp] IDL extended attribute
Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (200137 => 200138)
--- trunk/Source/WebCore/platform/graphics/Font.cpp 2016-04-27 18:57:56 UTC (rev 200137)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2016-04-27 18:59:52 UTC (rev 200138)
@@ -251,7 +251,7 @@
const Font& Font::verticalRightOrientationFont() const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->verticalRightOrientation) {
auto verticalRightPlatformData = FontPlatformData::cloneWithOrientation(m_platformData, Horizontal);
m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, isCustomFont(), false, true);
@@ -263,7 +263,7 @@
const Font& Font::uprightOrientationFont() const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->uprightOrientation)
m_derivedFontData->uprightOrientation = create(m_platformData, isCustomFont(), false, true);
ASSERT(m_derivedFontData->uprightOrientation != this);
@@ -273,7 +273,7 @@
const Font* Font::smallCapsFont(const FontDescription& fontDescription) const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->smallCaps)
m_derivedFontData->smallCaps = createScaledFont(fontDescription, smallCapsFontSizeMultiplier);
ASSERT(m_derivedFontData->smallCaps != this);
@@ -284,7 +284,7 @@
const Font& Font::noSynthesizableFeaturesFont() const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->noSynthesizableFeatures)
m_derivedFontData->noSynthesizableFeatures = createFontWithoutSynthesizableFeatures();
ASSERT(m_derivedFontData->noSynthesizableFeatures != this);
@@ -295,7 +295,7 @@
const Font* Font::emphasisMarkFont(const FontDescription& fontDescription) const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->emphasisMark)
m_derivedFontData->emphasisMark = createScaledFont(fontDescription, emphasisMarkFontSizeMultiplier);
ASSERT(m_derivedFontData->emphasisMark != this);
@@ -305,7 +305,7 @@
const Font& Font::brokenIdeographFont() const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->brokenIdeograph) {
m_derivedFontData->brokenIdeograph = create(m_platformData, isCustomFont(), false);
m_derivedFontData->brokenIdeograph->m_isBrokenIdeographFallback = true;
@@ -317,7 +317,7 @@
const Font& Font::nonSyntheticItalicFont() const
{
if (!m_derivedFontData)
- m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+ m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
if (!m_derivedFontData->nonSyntheticItalic) {
#if PLATFORM(COCOA) || USE(CAIRO)
FontPlatformData nonSyntheticItalicFontPlatformData = FontPlatformData::cloneWithSyntheticOblique(m_platformData, false);
@@ -352,7 +352,7 @@
return m_mathData.get();
}
-Font::DerivedFontData::~DerivedFontData()
+Font::DerivedFonts::~DerivedFonts()
{
}
Modified: trunk/Source/WebCore/platform/graphics/Font.h (200137 => 200138)
--- trunk/Source/WebCore/platform/graphics/Font.h 2016-04-27 18:57:56 UTC (rev 200137)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2016-04-27 18:59:52 UTC (rev 200138)
@@ -248,16 +248,16 @@
Glyph m_zeroWidthSpaceGlyph { 0 };
- struct DerivedFontData {
+ struct DerivedFonts {
#if !COMPILER(MSVC)
WTF_MAKE_FAST_ALLOCATED;
#endif
public:
- explicit DerivedFontData(bool custom)
+ explicit DerivedFonts(bool custom)
: forCustomFont(custom)
{
}
- ~DerivedFontData();
+ ~DerivedFonts();
bool forCustomFont;
RefPtr<Font> smallCaps;
@@ -269,7 +269,7 @@
RefPtr<Font> nonSyntheticItalic;
};
- mutable std::unique_ptr<DerivedFontData> m_derivedFontData;
+ mutable std::unique_ptr<DerivedFonts> m_derivedFontData;
#if USE(CG) || USE(CAIRO)
float m_syntheticBoldOffset;
