92a8124fef
This conversion was done with the script:
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl' | \
egrep -v 'cairo-win32-refptr.h|RefPtr.h|TestRefPtr.cpp' | \
xargs sed -i -e 's/mozilla::TemporaryRef</already_AddRefed</g' \
-e 's/TemporaryRef</already_AddRefed</g'
Manual fixups were performed in the following instances:
- We handled mfbt/RefPtr.h manually so as to not convert TemporaryRef itself
into already_AddRefed.
- The following files had explicit Move() calls added to make up for the lack
of a copy constructor on already_AddRefed:
dom/base/ImageEncoder.cpp
dom/media/MediaTaskQueue.{h,cpp}
dom/media/webaudio/PannerNode.cpp
- A redundant overload for MediaTaskQueue::Dispatch was deleted.
- A few manual fixups were required in mfbt/tests/TestRefPtr.cpp.
- Comments, using declarations, and forward declarations relating to
TemporaryRef in dom/canvas/ and gfx/layers/ were changed to refer to
already_AddRefed.
71 lines
1.9 KiB
C++
71 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* 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_SCALEDFONTDWRITE_H_
|
|
#define MOZILLA_GFX_SCALEDFONTDWRITE_H_
|
|
|
|
#include <dwrite.h>
|
|
#include "ScaledFontBase.h"
|
|
|
|
struct ID2D1GeometrySink;
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
class ScaledFontDWrite final : public ScaledFontBase
|
|
{
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontDwrite)
|
|
ScaledFontDWrite(IDWriteFontFace *aFont, Float aSize)
|
|
: mFontFace(aFont)
|
|
, ScaledFontBase(aSize)
|
|
{}
|
|
ScaledFontDWrite(uint8_t *aData, uint32_t aSize, uint32_t aIndex, Float aGlyphSize);
|
|
|
|
virtual FontType GetType() const { return FontType::DWRITE; }
|
|
|
|
virtual already_AddRefed<Path> GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aTarget);
|
|
virtual void CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder, BackendType aBackendType, const Matrix *aTransformHint);
|
|
|
|
void CopyGlyphsToSink(const GlyphBuffer &aBuffer, ID2D1GeometrySink *aSink);
|
|
|
|
virtual bool GetFontFileData(FontFileDataOutput aDataCallback, void *aBaton);
|
|
|
|
virtual AntialiasMode GetDefaultAAMode();
|
|
|
|
#ifdef USE_SKIA
|
|
virtual SkTypeface* GetSkTypeface()
|
|
{
|
|
MOZ_ASSERT(false, "Skia and DirectWrite do not mix");
|
|
return nullptr;
|
|
}
|
|
#endif
|
|
|
|
RefPtr<IDWriteFontFace> mFontFace;
|
|
};
|
|
|
|
class GlyphRenderingOptionsDWrite : public GlyphRenderingOptions
|
|
{
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GlyphRenderingOptionsDWrite)
|
|
GlyphRenderingOptionsDWrite(IDWriteRenderingParams *aParams)
|
|
: mParams(aParams)
|
|
{
|
|
}
|
|
|
|
virtual FontType GetType() const { return FontType::DWRITE; }
|
|
|
|
private:
|
|
friend class DrawTargetD2D;
|
|
friend class DrawTargetD2D1;
|
|
|
|
RefPtr<IDWriteRenderingParams> mParams;
|
|
};
|
|
|
|
}
|
|
}
|
|
|
|
#endif /* MOZILLA_GFX_SCALEDFONTDWRITE_H_ */
|