#include "SkTypeface.h"

// ===== Begin Chrome-specific definitions =====

uint32_t SkTypeface::UniqueID(const SkTypeface* face)
{
    return 0;
}

void SkTypeface::serialize(SkWStream* stream) const {
}

SkTypeface* SkTypeface::Deserialize(SkStream* stream) {
  return NULL;
}

// ===== End Chrome-specific definitions =====

#include "SkTypeface.h"

// ===== Begin Chrome-specific definitions =====

uint32_t SkTypeface::UniqueID(const SkTypeface* face)
{
    return NULL;
}

void SkTypeface::serialize(SkWStream* stream) const {
}

SkTypeface* SkTypeface::Deserialize(SkStream* stream) {
  return NULL;
}

// ===== End Chrome-specific definitions =====

--- 
+++ 
@@ -4,7 +4,7 @@
 
 uint32_t SkTypeface::UniqueID(const SkTypeface* face)
 {
-    return NULL;
+    return 0;
 }
 
 void SkTypeface::serialize(SkWStream* stream) const {
Return 0 instead of NULL for a non-pointer type.  Eliminates a warning in GCC.

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@981 0039d316-1c4b-4281-b951-d872f2087c98
