mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
91b071ed14
gfx::Color is currently misused in many places. The DrawTargets expect the color space to be in device space, e.g. what we are actually going to draw using. Everything sitting above generally deals with sRGB, as specified in CSS. Sometimes we missed the conversion from sRGB to device space when issuing draw calls, and similarly sometimes we converted the color to device space twice. This patch splits the type in two. sRGBColor and DeviceColor now represent sRGB and device color spaces respectively. DrawTarget only accepts DeviceColor, and one can get a DeviceColor from an sRGBColor via the ToDeviceColor helper API. The reftests now pass with color management enabled for everything (e.g. CSS) instead of just tagged raster images. There will be a follow up patch to enable color management everywhere by default on all supported platforms. Differential Revision: https://phabricator.services.mozilla.com/D64771 --HG-- extra : moz-landing-system : lando
98 lines
3.3 KiB
C++
98 lines
3.3 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef MOZILLA_GFX_SCALEDFONTMAC_H_
|
|
#define MOZILLA_GFX_SCALEDFONTMAC_H_
|
|
|
|
#ifdef MOZ_WIDGET_COCOA
|
|
# include <ApplicationServices/ApplicationServices.h>
|
|
#else
|
|
# include <CoreGraphics/CoreGraphics.h>
|
|
# include <CoreText/CoreText.h>
|
|
#endif
|
|
|
|
#include "2D.h"
|
|
|
|
#include "ScaledFontBase.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
class UnscaledFontMac;
|
|
|
|
class ScaledFontMac : public ScaledFontBase {
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontMac, override)
|
|
ScaledFontMac(CGFontRef aFont, const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
|
|
bool aOwnsFont = false,
|
|
const DeviceColor& aFontSmoothingBackgroundColor = DeviceColor(),
|
|
bool aUseFontSmoothing = true, bool aApplySyntheticBold = false);
|
|
~ScaledFontMac();
|
|
|
|
FontType GetType() const override { return FontType::MAC; }
|
|
#ifdef USE_SKIA
|
|
SkTypeface* CreateSkTypeface() override;
|
|
void SetupSkFontDrawOptions(SkFont& aFont) override;
|
|
#endif
|
|
already_AddRefed<Path> GetPathForGlyphs(const GlyphBuffer& aBuffer,
|
|
const DrawTarget* aTarget) override;
|
|
|
|
bool GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton) override;
|
|
|
|
bool GetWRFontInstanceOptions(Maybe<wr::FontInstanceOptions>* aOutOptions,
|
|
Maybe<wr::FontInstancePlatformOptions>* aOutPlatformOptions,
|
|
std::vector<FontVariation>* aOutVariations) override;
|
|
|
|
bool CanSerialize() override { return true; }
|
|
|
|
DeviceColor FontSmoothingBackgroundColor() { return mFontSmoothingBackgroundColor; }
|
|
|
|
#ifdef USE_CAIRO_SCALED_FONT
|
|
cairo_font_face_t* CreateCairoFontFace(cairo_font_options_t* aFontOptions) override;
|
|
#endif
|
|
|
|
private:
|
|
friend class DrawTargetSkia;
|
|
friend class UnscaledFontMac;
|
|
|
|
CGFontRef mFont;
|
|
CTFontRef mCTFont; // only created if CTFontDrawGlyphs is available, otherwise null
|
|
|
|
DeviceColor mFontSmoothingBackgroundColor;
|
|
bool mUseFontSmoothing;
|
|
bool mApplySyntheticBold;
|
|
|
|
struct InstanceData {
|
|
explicit InstanceData(ScaledFontMac* aScaledFont)
|
|
: mFontSmoothingBackgroundColor(aScaledFont->mFontSmoothingBackgroundColor),
|
|
mUseFontSmoothing(aScaledFont->mUseFontSmoothing),
|
|
mApplySyntheticBold(aScaledFont->mApplySyntheticBold) {}
|
|
|
|
InstanceData(const wr::FontInstanceOptions* aOptions,
|
|
const wr::FontInstancePlatformOptions* aPlatformOptions);
|
|
|
|
DeviceColor mFontSmoothingBackgroundColor;
|
|
bool mUseFontSmoothing;
|
|
bool mApplySyntheticBold;
|
|
};
|
|
|
|
typedef void(CTFontDrawGlyphsFuncT)(CTFontRef, const CGGlyph[], const CGPoint[], size_t,
|
|
CGContextRef);
|
|
|
|
static bool sSymbolLookupDone;
|
|
|
|
public:
|
|
// function pointer for CTFontDrawGlyphs, if available;
|
|
// initialized the first time a ScaledFontMac is created,
|
|
// so it will be valid by the time DrawTargetCG wants to use it
|
|
static CTFontDrawGlyphsFuncT* CTFontDrawGlyphsPtr;
|
|
};
|
|
|
|
} // namespace gfx
|
|
} // namespace mozilla
|
|
|
|
#endif /* MOZILLA_GFX_SCALEDFONTMAC_H_ */
|