Title: [187573] trunk/Source/WebCore
- Revision
- 187573
- Author
- mmaxfi...@apple.com
- Date
- 2015-07-29 19:54:45 -0700 (Wed, 29 Jul 2015)
Log Message
Fix iOS build
Unreviewed.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::FontCascade): Deleted.
* platform/graphics/FontCascade.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187572 => 187573)
--- trunk/Source/WebCore/ChangeLog 2015-07-30 02:34:07 UTC (rev 187572)
+++ trunk/Source/WebCore/ChangeLog 2015-07-30 02:54:45 UTC (rev 187573)
@@ -1,3 +1,13 @@
+2015-07-29 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Fix iOS build
+
+ Unreviewed.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::FontCascade): Deleted.
+ * platform/graphics/FontCascade.h:
+
2015-07-29 Gyuyoung Kim <gyuyoung....@webkit.org>
[EFL][CoordinatedGraphics] fixed position banner is moved when enabling delegateScrolling
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (187572 => 187573)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-07-30 02:34:07 UTC (rev 187572)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-07-30 02:54:45 UTC (rev 187573)
@@ -134,23 +134,6 @@
#endif
}
-// FIXME: We should make this constructor platform-independent.
-#if PLATFORM(IOS)
-FontCascade::FontCascade(const FontPlatformData& fontData, RefPtr<FontSelector>&& fontSelector)
- : m_weakPtrFactory(this)
- , m_letterSpacing(0)
- , m_wordSpacing(0)
- , m_typesettingFeatures(computeTypesettingFeatures())
-{
- CTFontRef primaryFont = fontData.font();
- m_fontDescription.setSpecifiedSize(CTFontGetSize(primaryFont));
- m_fontDescription.setComputedSize(CTFontGetSize(primaryFont));
- m_fontDescription.setIsItalic(CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitItalic);
- m_fontDescription.setWeight((CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitBold) ? FontWeightBold : FontWeightNormal);
- m_fonts = retrieveOrAddCachedFonts(m_fontDescription, WTF::move(fontSelector));
-}
-#endif
-
FontCascade::FontCascade(const FontCascade& other)
: m_fontDescription(other.m_fontDescription)
, m_fonts(other.m_fonts)
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (187572 => 187573)
--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-07-30 02:34:07 UTC (rev 187572)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-07-30 02:54:45 UTC (rev 187573)
@@ -119,11 +119,6 @@
// This constructor is only used if the platform wants to start with a native font.
WEBCORE_EXPORT FontCascade(const FontPlatformData&, FontSmoothingMode = AutoSmoothing);
- // FIXME: We should make this constructor platform-independent.
-#if PLATFORM(IOS)
- FontCascade(const FontPlatformData&, PassRefPtr<FontSelector>);
-#endif
-
FontCascade(const FontCascade&);
WEBCORE_EXPORT FontCascade& operator=(const FontCascade&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
