#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: http://src.chromium.org/svn/trunk/src@981 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: a451f742be414b7375e383968a9a47153da51447