1 files changed, 23 insertions, 31 deletions

diff --git a/skia/ports/SkFontHost_none.cpp b/skia/ports/SkFontHost_none.cpp
index 4e75abc..b45cf16 100644
--- a/skia/ports/SkFontHost_none.cpp
+++ b/skia/ports/SkFontHost_none.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008, Google Inc.
+/* Copyright 2006-2008, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License"); 
 ** you may not use this file except in compliance with the License. 
@@ -17,74 +17,66 @@
 
 SkTypeface* SkFontHost::FindTypeface(const SkTypeface* familyFace,
                                      const char famillyName[],
-                                     SkTypeface::Style style)
-{
+                                     SkTypeface::Style style) {
     SkASSERT(!"SkFontHost::FindTypeface unimplemented");
     return NULL;
 }
 
-SkTypeface* SkFontHost::ResolveTypeface(uint32_t uniqueID)
-{
+SkTypeface* SkFontHost::ResolveTypeface(uint32_t uniqueID) {
     SkASSERT(!"SkFontHost::ResolveTypeface unimplemented");
     return NULL;
 }
 
-SkStream* SkFontHost::OpenStream(uint32_t uniqueID)
-{
+SkStream* SkFontHost::OpenStream(uint32_t uniqueID) {
     SkASSERT(!"SkFontHost::OpenStream unimplemented");
     return NULL;
 }
 
-void SkFontHost::CloseStream(uint32_t uniqueID, SkStream*)
-{
+void SkFontHost::CloseStream(uint32_t uniqueID, SkStream*) {
     SkASSERT(!"SkFontHost::CloseStream unimplemented");
 }
 
-SkTypeface* SkFontHost::CreateTypeface(SkStream*)
-{
+SkTypeface* SkFontHost::CreateTypeface(SkStream*) {
     SkASSERT(!"SkFontHost::CreateTypeface unimplemented");
     return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc)
-{
+void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {
+    SkASSERT(!"SkFontHost::Serialize unimplemented");
+}
+
+SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
+    SkASSERT(!"SkFontHost::Deserialize unimplemented");
+    return NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc) {
     SkASSERT(!"SkFontHost::CreateScalarContext unimplemented");
     return NULL;
 }
 
-SkScalerContext* SkFontHost::CreateFallbackScalerContext(const SkScalerContext::Rec&)
-{
+SkScalerContext* SkFontHost::CreateFallbackScalerContext(
+                                                const SkScalerContext::Rec&) {
     SkASSERT(!"SkFontHost::CreateFallbackScalerContext unimplemented");
     return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-size_t SkFontHost::ShouldPurgeFontCache(size_t sizeAllocatedSoFar)
-{
+size_t SkFontHost::ShouldPurgeFontCache(size_t sizeAllocatedSoFar) {
     return 0;   // nothing to do (change me if you want to limit the font cache)
 }
 
-int SkFontHost::ComputeGammaFlag(const SkPaint& paint)
-{
+int SkFontHost::ComputeGammaFlag(const SkPaint& paint) {
     return 0;
 }
 
-void SkFontHost::GetGammaTables(const uint8_t* tables[2])
-{
+void SkFontHost::GetGammaTables(const uint8_t* tables[2]) {
     tables[0] = NULL;   // black gamma (e.g. exp=1.4)
     tables[1] = NULL;   // white gamma (e.g. exp= 1/1.4)
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
-    SkASSERT(!"SkFontHost::Deserialize unimplemented");
-    return NULL;
-}
-
-void SkFontHost::Serialize(const SkTypeface*, SkWStream*) {
-    SkASSERT(!"SkFontHost::Serialize unimplemented");
-}