Merge change 21484 into master-webkit-merge

* changes:
  Fix FontCustomPlatformData.h as in https://bugs.webkit.org/show_bug.cgi?id=28065

2 files changed, 3 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
index eb1933c..bb465ef 100644
--- a/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
+++ b/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
@@ -64,7 +64,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
     // make a copy of it.
     SkStream* stream = new SkMemoryStream(buffer->data(), buffer->size(), true);
     SkTypeface* face = SkTypeface::CreateFromStream(stream);
-    if (NULL == face) {
+    if (0 == face) {
         SkDebugf("--------- SkTypeface::CreateFromBuffer failed %d\n",
                  buffer->size());
         return NULL;
diff --git a/WebCore/platform/graphics/android/FontCustomPlatformData.h b/WebCore/platform/graphics/android/FontCustomPlatformData.h
index e45d509..910d616 100644
--- a/WebCore/platform/graphics/android/FontCustomPlatformData.h
+++ b/WebCore/platform/graphics/android/FontCustomPlatformData.h
@@ -26,8 +26,8 @@
 #ifndef FontCustomPlatformData_h_
 #define FontCustomPlatformData_h_
 
-#include <wtf/Noncopyable.h>
 #include "FontRenderingMode.h"
+#include <wtf/Noncopyable.h>
 
 class SkTypeface;
 
@@ -36,7 +36,7 @@ namespace WebCore {
     class SharedBuffer;
     class FontPlatformData;
     
-    class FontCustomPlatformData : Noncopyable {
+    class FontCustomPlatformData : public Noncopyable {
     public:
         FontCustomPlatformData(SkTypeface* face);
         ~FontCustomPlatformData();