diff options
author | Andrei Popescu <andreip@google.com> | 2009-08-17 13:11:39 +0100 |
---|---|---|
committer | Andrei Popescu <andreip@google.com> | 2009-08-17 13:11:39 +0100 |
commit | 35034decbf94c22dd9466024455977a0a20e77d7 (patch) | |
tree | 6d868fcf82c96f19295ea22e7047be56416ff5aa /WebCore | |
parent | e9ad5c47c4280945f60b4525ce59316dbe6501cc (diff) | |
download | external_webkit-35034decbf94c22dd9466024455977a0a20e77d7.zip external_webkit-35034decbf94c22dd9466024455977a0a20e77d7.tar.gz external_webkit-35034decbf94c22dd9466024455977a0a20e77d7.tar.bz2 |
Fix FontCustomPlatformData.h as in https://bugs.webkit.org/show_bug.cgi?id=28065
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/platform/graphics/android/FontCustomPlatformData.cpp | 2 | ||||
-rw-r--r-- | WebCore/platform/graphics/android/FontCustomPlatformData.h | 4 |
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(); |