diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-19 13:57:02 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 5144992c32630d3a9d1af0171204232d5d6eb442 (patch) | |
| tree | 3d9851588375f2eb2ac341c0f37bd4a39f07b3cb /WebCore | |
| parent | 6efecf1c29875c08372e1feb247fabcbfba9e16a (diff) | |
| download | external_webkit-5144992c32630d3a9d1af0171204232d5d6eb442.zip external_webkit-5144992c32630d3a9d1af0171204232d5d6eb442.tar.gz external_webkit-5144992c32630d3a9d1af0171204232d5d6eb442.tar.bz2 | |
Merge WebKit at r72274: Add orientation stub
Orientation is hardwired to horizontal. Needs proper implementation.
http://trac.webkit.org/changeset/71970
Change-Id: If838dd9689e0e54b282baaa82515b2460e50578f
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/FontPlatformData.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/FontPlatformData.h b/WebCore/platform/graphics/android/FontPlatformData.h index 7d2176d..ce2f62a 100644 --- a/WebCore/platform/graphics/android/FontPlatformData.h +++ b/WebCore/platform/graphics/android/FontPlatformData.h @@ -30,12 +30,13 @@ #ifndef FontPlatformData_H #define FontPlatformData_H +#include "FontOrientation.h" +#include <wtf/text/StringImpl.h> + #ifndef NDEBUG #include "PlatformString.h" #endif -#include <wtf/text/StringImpl.h> - class SkPaint; class SkTypeface; @@ -63,6 +64,8 @@ public: return mTypeface == hashTableDeletedFontValue(); } + FontOrientation orientation() const { return Horizontal; } // FIXME: Implement. + FontPlatformData& operator=(const FontPlatformData&); bool operator==(const FontPlatformData& a) const; |