diff options
| author | Steve Block <steveblock@google.com> | 2011-06-02 18:44:31 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:04:37 +0100 |
| commit | 51d903c932419e958f11480f3cea5d2b3ce9d621 (patch) | |
| tree | 8bf0e006875aa5a49c442d995da3292f966c2730 | |
| parent | 9c8e65377a8462e90abc85e3d888365f7fecf9e3 (diff) | |
| download | external_webkit-51d903c932419e958f11480f3cea5d2b3ce9d621.zip external_webkit-51d903c932419e958f11480f3cea5d2b3ce9d621.tar.gz external_webkit-51d903c932419e958f11480f3cea5d2b3ce9d621.tar.bz2 | |
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
See http://trac.webkit.org/changeset/80582
Change-Id: I2c4ecc1abd1b639aa10affc04b5549a8a2fb2ab7
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp | 3 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontCustomPlatformData.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp index 7190f32..72fac68 100644 --- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp +++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp @@ -45,8 +45,7 @@ FontCustomPlatformData::~FontCustomPlatformData() // the unref is enough to release the font data... } -FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, - FontOrientation, FontWidthVariant, FontRenderingMode) +FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, 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 f74abc5..47e5e71 100644 --- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h +++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h @@ -29,6 +29,7 @@ #include "FontOrientation.h" #include "FontRenderingMode.h" #include "FontWidthVariant.h" +#include "TextOrientation.h" #include <wtf/Forward.h> #include <wtf/Noncopyable.h> @@ -47,7 +48,7 @@ public: SkTypeface* typeface() const { return m_typeface; } - FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode); + FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode); static bool supportsFormat(const String&); private: |