| Index: sky/engine/platform/graphics/GraphicsContext.h.rej
|
| diff --git a/sky/engine/platform/graphics/GraphicsContext.h.rej b/sky/engine/platform/graphics/GraphicsContext.h.rej
|
| deleted file mode 100644
|
| index 291091426b9f9fefa9d95e630f2952ef1cfa2045..0000000000000000000000000000000000000000
|
| --- a/sky/engine/platform/graphics/GraphicsContext.h.rej
|
| +++ /dev/null
|
| @@ -1,15 +0,0 @@
|
| ---- platform/graphics/GraphicsContext.h
|
| -+++ platform/graphics/GraphicsContext.h
|
| -@@ -155,11 +155,10 @@
|
| - // FIXME: the setter is only used once, at construction time; convert to a constructor param,
|
| - // and possibly consolidate with other flags (paintDisabled, isPrinting, ...)
|
| - void setShouldSmoothFonts(bool smoothFonts) { m_shouldSmoothFonts = smoothFonts; }
|
| -- bool shouldSmoothFonts() const { return m_shouldSmoothFonts; }
|
| -
|
| - // Turn off LCD text for the paint if not supported on this context.
|
| - void adjustTextRenderMode(SkPaint*) const;
|
| -- bool couldUseLCDRenderedText() const;
|
| -+ bool couldUseLCDRenderedText() const { return m_isCertainlyOpaque && m_shouldSmoothFonts; }
|
| -
|
| - void setTextDrawingMode(TextDrawingModeFlags mode) { mutableState()->setTextDrawingMode(mode); }
|
| - TextDrawingModeFlags textDrawingMode() const { return immutableState()->textDrawingMode(); }
|
|
|