Title: [184832] trunk/Source/WebCore
- Revision
- 184832
- Author
- [email protected]
- Date
- 2015-05-23 18:22:53 -0700 (Sat, 23 May 2015)
Log Message
Cleanup after r184796
https://bugs.webkit.org/show_bug.cgi?id=145333
Reviewed by Alexey Proskuryakov.
No new tests because there is no behavior change.
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::RenderingStyleSaver::RenderingStyleSaver): Deleted.
(WebCore::RenderingStyleSaver::~RenderingStyleSaver): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184831 => 184832)
--- trunk/Source/WebCore/ChangeLog 2015-05-23 21:32:22 UTC (rev 184831)
+++ trunk/Source/WebCore/ChangeLog 2015-05-24 01:22:53 UTC (rev 184832)
@@ -1,3 +1,16 @@
+2015-05-23 Myles C. Maxfield <[email protected]>
+
+ Cleanup after r184796
+ https://bugs.webkit.org/show_bug.cgi?id=145333
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::RenderingStyleSaver::RenderingStyleSaver): Deleted.
+ (WebCore::RenderingStyleSaver::~RenderingStyleSaver): Deleted.
+
2015-05-23 Yusuke Suzuki <[email protected]>
Introduce UniquedStringImpl and SymbolImpl to separate symbolic strings from AtomicStringImpl
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (184831 => 184832)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-05-23 21:32:22 UTC (rev 184831)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-05-24 01:22:53 UTC (rev 184832)
@@ -131,56 +131,6 @@
#endif
}
-class RenderingStyleSaver {
-public:
-#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-
- RenderingStyleSaver(CTFontRef, CGContextRef) { }
-
-#elif !defined(CORETEXT_HAS_CTFontSetRenderingStyle) || CORETEXT_HAS_CTFontSetRenderingStyle != 1
-
- // This is very slow, but it's just a holdover until everyone migrates to CTFontSetRenderingStyle()
- // FIXME: Delete this implementation when everyone has migrated off
- RenderingStyleSaver(CTFontRef font, CGContextRef context)
- : m_context(context)
- {
- CGContextSaveGState(context);
- CTFontSetRenderingParameters(font, context);
- }
-
- ~RenderingStyleSaver()
- {
- CGContextRestoreGState(m_context);
- }
-
-private:
- CGContextRef m_context;
-
-#else
-
- RenderingStyleSaver(CTFontRef font, CGContextRef context)
- : m_context(context)
- {
- m_changed = CTFontSetRenderingStyle(font, context, &m_originalStyle, &m_originalDilation);
- }
-
- ~RenderingStyleSaver()
- {
- if (!m_changed)
- return;
- CGContextSetFontRenderingStyle(m_context, m_originalStyle);
- CGContextSetFontDilation(m_context, m_originalDilation);
- }
-
-private:
- bool m_changed;
- CGContextRef m_context;
- CGFontRenderingStyle m_originalStyle;
- CGSize m_originalDilation;
-
-#endif
-};
-
static void showGlyphsWithAdvances(const FloatPoint& point, const Font* font, CGContextRef context, const CGGlyph* glyphs, const CGSize* advances, size_t count)
{
if (!count)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
