API modifications needed to upstream Android font changes.
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 13 May 2013 14:09:13 +0000 (14:09 +0000)
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 13 May 2013 14:09:13 +0000 (14:09 +0000)
commitc7a20e40938ae031368e3a9e4df33ce90a765aba
tree4add9484124ec6dd3893593f639575d6a9ccb3b3
parent28ac96e40d705f7fb08a61ac027e15de8d91823c
API modifications needed to upstream Android font changes.

Committed: http://code.google.com/p/skia/source/detail?r=9083

R=reed@google.com

Author: djsollen@google.com

Review URL: https://chromiumcodereview.appspot.com/14761003

git-svn-id: http://skia.googlecode.com/svn/trunk@9107 2bbb7eff-a529-9590-31e7-b0007b416f81
gyp/core.gyp
include/core/SkPaint.h
include/core/SkPaintOptionsAndroid.h [new file with mode: 0644]
include/ports/SkTypeface_android.h
src/core/SkPaint.cpp
src/core/SkPaintOptionsAndroid.cpp [new file with mode: 0644]
src/core/SkScalerContext.cpp
src/core/SkScalerContext.h
src/ports/SkFontHost_android.cpp