summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-02 19:03:22 +0100
committerSteve Block <steveblock@google.com>2011-06-08 15:04:39 +0100
commit0c71a938bf93014d65da79a51825ee2d7941bd12 (patch)
treebbc9acfe60e66b56ab5e01b8d1ed18f27050c308 /Source
parent1d6203383f91bfb5d9179144b687e7b2f6879228 (diff)
downloadexternal_webkit-0c71a938bf93014d65da79a51825ee2d7941bd12.zip
external_webkit-0c71a938bf93014d65da79a51825ee2d7941bd12.tar.gz
external_webkit-0c71a938bf93014d65da79a51825ee2d7941bd12.tar.bz2
Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
See http://trac.webkit.org/changeset/80582 and http://trac.webkit.org/changeset/80589 Change-Id: I77941a880d7bb8347efcf6969a378ed941fce0e6
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/graphics/android/FontPlatformData.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontPlatformData.h b/Source/WebCore/platform/graphics/android/FontPlatformData.h
index 498db47..3313aca 100644
--- a/Source/WebCore/platform/graphics/android/FontPlatformData.h
+++ b/Source/WebCore/platform/graphics/android/FontPlatformData.h
@@ -65,6 +65,7 @@ public:
}
FontOrientation orientation() const { return Horizontal; } // FIXME: Implement.
+ void setOrientation(FontOrientation) { } // FIXME: Implement.
FontPlatformData& operator=(const FontPlatformData&);
bool operator==(const FontPlatformData& a) const;