diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-11-22 06:18:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-22 06:18:11 -0800 |
| commit | 71a81ea1f7f51e7c30a4880e25f71f45e76181c2 (patch) | |
| tree | 2a5163984bb876d5be3f6c385e7bfe861811759b | |
| parent | be5a48f03761c980b096111d62e9ca03624e8364 (diff) | |
| parent | e58043a33f14a99ec253a249a2e79c559fab465d (diff) | |
| download | external_webkit-71a81ea1f7f51e7c30a4880e25f71f45e76181c2.zip external_webkit-71a81ea1f7f51e7c30a4880e25f71f45e76181c2.tar.gz external_webkit-71a81ea1f7f51e7c30a4880e25f71f45e76181c2.tar.bz2 | |
Merge "Fix for bug 5152544, reduce warnings in external/webkit"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp b/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp index c09120f..e4fa435 100644 --- a/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp @@ -116,7 +116,7 @@ FontPlatformData::FontPlatformData(SkTypeface* tf, float textSize, bool fakeBold FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize) : mTypeface(src.mTypeface), mTextSize(textSize), mEmSizeInFontUnits(src.mEmSizeInFontUnits), mFakeBold(src.mFakeBold), mFakeItalic(src.mFakeItalic), - m_harfbuzzFace(src.m_harfbuzzFace), mOrientation(src.mOrientation), mTextOrientation(src.mTextOrientation) + mOrientation(src.mOrientation), mTextOrientation(src.mTextOrientation), m_harfbuzzFace(src.m_harfbuzzFace) { if (hashTableDeletedFontValue() != mTypeface) { SkSafeRef(mTypeface); |