diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 19:06:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:51 +0100 |
| commit | fa3930915cc4aeb95cd6d07f8ad0ae48e83f735a (patch) | |
| tree | 93ea540ed7f7878cde1793f3abef603051a50274 /Source/WebCore/platform | |
| parent | 1ed8c4d16ac986307f1c0589a3a720a37e60f313 (diff) | |
| download | external_webkit-fa3930915cc4aeb95cd6d07f8ad0ae48e83f735a.zip external_webkit-fa3930915cc4aeb95cd6d07f8ad0ae48e83f735a.tar.gz external_webkit-fa3930915cc4aeb95cd6d07f8ad0ae48e83f735a.tar.bz2 | |
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
See http://trac.webkit.org/changeset/77153
Change-Id: I8a5b0878803b88ff0ebac3539a6d62f94cc10f89
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontCustomPlatformData.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp index 4795d9e..7190f32 100644 --- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp +++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp @@ -46,7 +46,7 @@ FontCustomPlatformData::~FontCustomPlatformData() } FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, - FontOrientation, FontRenderingMode) + FontOrientation, FontWidthVariant, FontRenderingMode) { // turn bold/italic into fakeBold/fakeItalic if (m_typeface != NULL) { diff --git a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h index b03afa9..f74abc5 100644 --- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h +++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h @@ -28,6 +28,7 @@ #include "FontOrientation.h" #include "FontRenderingMode.h" +#include "FontWidthVariant.h" #include <wtf/Forward.h> #include <wtf/Noncopyable.h> @@ -46,7 +47,7 @@ public: SkTypeface* typeface() const { return m_typeface; } - FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontRenderingMode); + FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode); static bool supportsFormat(const String&); private: |