Bug 716415 - Fix windows build of Skia. r=jrmuizel
authorMatt Woodrow <mwoodrow@mozilla.com>
Thu, 19 Jan 2012 17:48:35 +1300
changeset 87312 fced79b75704a979de94b5f327c8fca8ac32362e
parent 87311 8763e1f49736cb2785123a9beda5d5cd5cf3ebdb
child 87313 8de271eee34b5d670e791041ba9bb536bc79542e
push idunknown
push userunknown
push dateunknown
reviewersjrmuizel
bugs716415
milestone12.0a1
Bug 716415 - Fix windows build of Skia. r=jrmuizel
gfx/skia/Makefile.in
gfx/skia/src/ports/FontHostConfiguration_android.cpp
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -306,31 +306,33 @@ CPPSRCS += \
 	$(NULL)
 endif
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_android.cpp \
 	SkFontHost_gamma.cpp \
+	FontHostConfiguration_android.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 
 DEFINES += -DSK_BUILD_FOR_ANDROID_NDK
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 EXPORTS_skia += \
 	include/config/sk_stdint.h \
 	include/ports/SkTypeface_win.h \
 	$(NULL)
 CPPSRCS += \
 	SkFontHost_win.cpp \
+	SkFontHost_sandbox_none.cpp \
 	SkTime_win.cpp \
 	$(NULL)
 endif
 
 ifneq (,$(INTEL_ARCHITECTURE))
 CPPSRCS += \
 	SkBitmapProcState_opts_SSE2.cpp \
 	SkBlitRow_opts_SSE2.cpp \
--- a/gfx/skia/src/ports/FontHostConfiguration_android.cpp
+++ b/gfx/skia/src/ports/FontHostConfiguration_android.cpp
@@ -11,16 +11,17 @@
 ** Unless required by applicable law or agreed to in writing, software
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 
 #include "FontHostConfiguration_android.h"
+#include <expat_config.h>
 #include <expat.h>
 #include "SkTDArray.h"
 
 #define SYSTEM_FONTS_FILE "/system/etc/system_fonts.xml"
 #define FALLBACK_FONTS_FILE "/system/etc/fallback_fonts.xml"
 #define VENDOR_FONTS_FILE "/vendor/etc/fallback_fonts.xml"