Bug 733922 - Fix Qt port compilation with --enable-skia. r=gwright

This commit is contained in:
Oleg Romashin 2012-03-22 13:24:57 -07:00
parent ea813f0678
commit b87df218fe
3 changed files with 29 additions and 0 deletions

View File

@ -333,6 +333,22 @@ CPPSRCS += \
OS_CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += \
SkFontHost_FreeType.cpp \
SkFontHost_gamma_none.cpp \
SkMMapStream.cpp \
SkOSFile.cpp \
$(NULL)
ifeq (Linux,$(OS_TARGET))
CPPSRCS += \
SkFontHost_linux.cpp \
SkTime_Unix.cpp \
$(NULL)
endif
OS_CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
EXPORTS_skia += \
include/config/sk_stdint.h \

View File

@ -46,6 +46,8 @@
#include "gfxFontconfigUtils.h"
#include "mozilla/gfx/2D.h"
#include "cairo.h"
#include "gfxImageSurface.h"
@ -81,6 +83,7 @@
using namespace mozilla;
using namespace mozilla::unicode;
using namespace mozilla::gfx;
#define DEFAULT_RENDER_MODE RENDER_DIRECT
@ -596,3 +599,11 @@ gfxQtPlatform::GetOffscreenFormat()
{
return sOffscreenFormat;
}
bool
gfxQtPlatform::SupportsAzure(BackendType& aBackend)
{
aBackend = BACKEND_SKIA;
return true;
}

View File

@ -76,6 +76,8 @@ public:
already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
gfxASurface::gfxContentType contentType);
virtual bool SupportsAzure(mozilla::gfx::BackendType& aBackend);
nsresult GetFontList(nsIAtom *aLangGroup,
const nsACString& aGenericFamily,
nsTArray<nsString>& aListOfFonts);