Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 751463: Remove Azure from XUL. r=khuey

Browse Source
This commit is contained in:
Bas Schouten 2012-05-03 21:21:52 +02:00
parent 46622a4bc4
commit 0f0ca8f00f
8 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/2d/2D.h
View File

@ -787,7 +787,7 @@ protected:
SurfaceFormat mFormat;
};
class Factory
class GFX2D_API Factory
{
public:
static TemporaryRef<DrawTarget> CreateDrawTargetForCairoSurface(cairo_surface_t* aSurface);

2
gfx/2d/Blur.h
View File

@ -60,7 +60,7 @@ namespace gfx {
* any desired content onto the context acquired through GetContext, and lastly
* calls Paint to apply the blurred content as an alpha mask.
*/
class AlphaBoxBlur
class GFX2D_API AlphaBoxBlur
{
public:

4
gfx/2d/Factory.cpp
View File

@ -280,18 +280,18 @@ Factory::CreateDWriteGlyphRenderingOptions(IDWriteRenderingParams *aParams)
#endif // XP_WIN
#ifdef USE_CAIRO
TemporaryRef<DrawTarget>
Factory::CreateDrawTargetForCairoSurface(cairo_surface_t* aSurface)
{
#ifdef USE_CAIRO
RefPtr<DrawTargetCairo> newTarget = new DrawTargetCairo();
if (newTarget->Init(aSurface)) {
return newTarget;
}
#endif
return NULL;
}
#endif
}
}

4
gfx/2d/Makefile.in
View File

@ -84,7 +84,7 @@ CPPSRCS += \
$(NULL)
endif
DEFINES += -DMOZ_GFX -DUSE_CAIRO
DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
ifdef MOZ_ENABLE_SKIA
CPPSRCS += \
@ -125,7 +125,7 @@ CPPSRCS += \
PathD2D.cpp \
ScaledFontDWrite.cpp \
$(NULL)
DEFINES += -DWIN32
DEFINES += -DWIN32 -DINITGUID
ifdef MOZ_ENABLE_SKIA
CPPSRCS += \

4
gfx/2d/Matrix.h
View File

@ -83,7 +83,7 @@ public:
return retSize;
}
Rect TransformBounds(const Rect& rect) const;
GFX2D_API Rect TransformBounds(const Rect& rect) const;
// Apply a scale to this matrix. This scale will be applied -before- the
// existing transformation of the matrix.
@ -138,7 +138,7 @@ public:
return _11 * _22 - _12 * _21;
}
static Matrix Rotation(Float aAngle);
GFX2D_API static Matrix Rotation(Float aAngle);
Matrix operator*(const Matrix &aMatrix) const
{

10
gfx/2d/Types.h
View File

@ -154,6 +154,16 @@ struct GradientStop
}
}
#ifdef XP_WIN
#ifdef GFX2D_INTERNAL
#define GFX2D_API __declspec(dllexport)
#else
#define GFX2D_API __declspec(dllimport)
#endif
#else
#define GFX2D_API
#endif
// Side constants for use in various places
namespace mozilla {
namespace css {

4
layout/media/Makefile.in
View File

@ -119,6 +119,10 @@ SHARED_LIBRARY_LIBS += \
$(DEPTH)/parser/expat/lib/$(LIB_PREFIX)mozexpat_s.$(LIB_SUFFIX) \
$(NULL)
SHARED_LIBRARY_LIBS += \
$(DEPTH)/gfx/2d/$(LIB_PREFIX)gfx2d.$(LIB_SUFFIX) \
$(NULL)
ifeq (WINNT,$(OS_TARGET))
EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)

1
toolkit/library/Makefile.in
View File

@ -104,7 +104,6 @@ STATIC_LIBS += \
mozipc_s \
mozipdlgen_s \
ipcshell_s \
gfx2d \
gfxipc_s \
hal_s \
dombindings_s \