Bug 719872 (part 1) - Backout 8de271eee34b r=mattwoodrow DONTBUILD
authorJames Willcox <jwillcox@mozilla.com>
Mon, 30 Jan 2012 16:47:19 -0500
changeset 86978 b735935813b2174fed1330293f25802c673b43ae
parent 86977 567bc606a167a6ca4d84aaedeab8ba1a33f7789a
child 86979 8e80c7006ebafa9775bd228aaa10c3afa6f16217
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs719872
milestone12.0a1
Bug 719872 (part 1) - Backout 8de271eee34b r=mattwoodrow DONTBUILD
gfx/skia/Makefile.in
gfx/skia/src/ports/FontHostConfiguration_android.cpp
gfx/skia/src/ports/SkFontHost_none.cpp
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -304,17 +304,20 @@ EXPORTS_skia += \
 CPPSRCS += \
 	SkFontHost_mac_coretext.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 endif
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
-	SkFontHost_none.cpp \
+	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
 
--- 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"
 
 
--- a/gfx/skia/src/ports/SkFontHost_none.cpp
+++ b/gfx/skia/src/ports/SkFontHost_none.cpp
@@ -25,18 +25,17 @@ SkTypeface* SkFontHost::CreateTypefaceFr
 SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*) {
     SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented");
     return NULL;
 }
 
 // static
 SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
         uint32_t fontID,
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
-        const uint32_t*, uint32_t) {
+        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo) {
     SkDEBUGFAIL("SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
     return NULL;
 }
 
 void SkFontHost::FilterRec(SkScalerContext::Rec* rec) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////