diff options
| author | John Reck <jreck@google.com> | 2010-11-04 14:53:10 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:38:13 -0800 |
| commit | a7c57d04cd472b56dc816aff1a1203cfc7bb24b0 (patch) | |
| tree | e23b5a8eaa2827f4c1881ae49c62aa7b79e570f0 | |
| parent | b012db01d2d631b3f1dbd4eb172b25a63ea590d9 (diff) | |
| download | external_webkit-a7c57d04cd472b56dc816aff1a1203cfc7bb24b0.zip external_webkit-a7c57d04cd472b56dc816aff1a1203cfc7bb24b0.tar.gz external_webkit-a7c57d04cd472b56dc816aff1a1203cfc7bb24b0.tar.bz2 | |
Merge Webkit at r70949: Added FontOrientation param
FontOrientation was added as a parameter to the fontPlatformData function
http://trac.webkit.org/changeset/70250
Change-Id: I918401828c6b1cd9901c0aa50f6a6ffffac01a8c
| -rw-r--r-- | WebCore/platform/graphics/android/FontCustomPlatformData.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/FontCustomPlatformData.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/WebCore/platform/graphics/android/FontCustomPlatformData.cpp index 90a9f41..e17e532 100644 --- a/WebCore/platform/graphics/android/FontCustomPlatformData.cpp +++ b/WebCore/platform/graphics/android/FontCustomPlatformData.cpp @@ -46,7 +46,7 @@ FontCustomPlatformData::~FontCustomPlatformData() } FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, - FontRenderingMode mode) + FontOrientation, FontRenderingMode) { // turn bold/italic into fakeBold/fakeItalic if (m_typeface != NULL) { diff --git a/WebCore/platform/graphics/android/FontCustomPlatformData.h b/WebCore/platform/graphics/android/FontCustomPlatformData.h index b41417c..3514ae7 100644 --- a/WebCore/platform/graphics/android/FontCustomPlatformData.h +++ b/WebCore/platform/graphics/android/FontCustomPlatformData.h @@ -26,6 +26,7 @@ #ifndef FontCustomPlatformData_h #define FontCustomPlatformData_h +#include "FontOrientation.h" #include "FontRenderingMode.h" #include <wtf/Forward.h> #include <wtf/Noncopyable.h> @@ -44,7 +45,7 @@ public: SkTypeface* typeface() const { return m_typeface; } - FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontRenderingMode ); + FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontRenderingMode); static bool supportsFormat(const String&); private: |