Bug 716415 - Follow to include changes that I forgot to qref. r=bustage
authorMatt Woodrow <mwoodrow@mozilla.com>
Thu, 19 Jan 2012 17:55:27 +1300
changeset 87313 8de271eee34b5d670e791041ba9bb536bc79542e
parent 87312 fced79b75704a979de94b5f327c8fca8ac32362e
child 87314 2cfe51d20cceef4d2236ec3c6b4da1c6e6e06197
push idunknown
push userunknown
push dateunknown
reviewersbustage
bugs716415
milestone12.0a1
Bug 716415 - Follow to include changes that I forgot to qref. r=bustage
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
@@ -303,20 +303,17 @@ EXPORTS_skia += \
 CPPSRCS += \
 	SkFontHost_mac_coretext.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 endif
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
-	SkFontHost_FreeType.cpp \
-	SkFontHost_android.cpp \
-	SkFontHost_gamma.cpp \
-	FontHostConfiguration_android.cpp \
+	SkFontHost_none.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,17 +11,16 @@
 ** 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,17 +25,18 @@ SkTypeface* SkFontHost::CreateTypefaceFr
 SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*) {
     SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented");
     return NULL;
 }
 
 // static
 SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
         uint32_t fontID,
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo) {
+        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        const uint32_t*, uint32_t) {
     SkDEBUGFAIL("SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
     return NULL;
 }
 
 void SkFontHost::FilterRec(SkScalerContext::Rec* rec) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////