mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-24 01:17:34 +09:00
Issue #61 - Reinstate buildability with shared gkmedias dll
This fully works for splitting gkmedias.dll back out from xul with one exception which is Skia throwing undefined externals when linking gkmedias.
This commit is contained in:
parent
2554a83d1d
commit
371d7cf05d
31 changed files with 804 additions and 16 deletions
|
|
@ -84,6 +84,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
|||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
||||
DEFINES['SKIA_DLL'] = 1
|
||||
DEFINES['GR_DLL'] = 1
|
||||
|
||||
# We should autogenerate these SSE related flags.
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
|
|
|
|||
|
|
@ -643,7 +643,6 @@ else:
|
|||
'skia/src/opts/SkBlitRow_opts_none.cpp',
|
||||
]
|
||||
|
||||
|
||||
# We allow warnings for third-party code that can be updated from upstream.
|
||||
ALLOW_COMPILER_WARNINGS = True
|
||||
|
||||
|
|
@ -694,6 +693,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
|||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
||||
DEFINES['SKIA_DLL'] = 1
|
||||
DEFINES['GR_DLL'] = 1
|
||||
DEFINES['SK_FONT_HOST_USE_SYSTEM_SETTINGS'] = 1
|
||||
|
||||
# We should autogenerate these SSE related flags.
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public:
|
|||
* specified canvas. Also copies the target canvas matrix and clip bounds.
|
||||
*/
|
||||
SkPaintFilterCanvas(SkCanvas* canvas);
|
||||
|
||||
|
||||
enum Type {
|
||||
kPaint_Type,
|
||||
kPoint_Type,
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include "SkLatticeIter.h"
|
||||
#include "SkMatrixUtils.h"
|
||||
#include "SkMetaData.h"
|
||||
#include "SkNWayCanvas.h"
|
||||
#include "SkNx.h"
|
||||
#include "SkPaintPriv.h"
|
||||
#include "SkPatchUtils.h"
|
||||
|
|
@ -45,9 +46,10 @@
|
|||
#include "GrContext.h"
|
||||
#include "GrRenderTarget.h"
|
||||
#include "SkGrPriv.h"
|
||||
|
||||
#endif
|
||||
|
||||
class SkNWayCanvas;
|
||||
|
||||
#define RETURN_ON_NULL(ptr) do { if (nullptr == (ptr)) return; } while (0)
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ SkScalerContext* DWriteFontTypeface::onCreateScalerContext(const SkScalerContext
|
|||
}
|
||||
|
||||
#ifdef MOZ_SKIA
|
||||
IDWriteRenderingParams* GetDwriteRenderingParams(bool aGDI);
|
||||
extern IDWriteRenderingParams* GetDwriteRenderingParams(bool aGDI);
|
||||
#endif
|
||||
|
||||
void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue