diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 18:06:19 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 18:06:19 +0000 |
| commit | eb3128f4d9aaa6c0d728e414da58b34249c53f80 (patch) | |
| tree | 49c854c81e9ce419304293f2139fa035e626a6c8 /skia | |
| parent | 3aeb0e942f656ded458142ebc2607e1ad7f4ed27 (diff) | |
| download | chromium_src-eb3128f4d9aaa6c0d728e414da58b34249c53f80.zip chromium_src-eb3128f4d9aaa6c0d728e414da58b34249c53f80.tar.gz chromium_src-eb3128f4d9aaa6c0d728e414da58b34249c53f80.tar.bz2 | |
Roll Skia to 3866.
Review URL: https://chromiumcodereview.appspot.com/10383063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig.cpp | 3 | ||||
| -rw-r--r-- | skia/skia.gyp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/skia/ext/SkFontHost_fontconfig.cpp b/skia/ext/SkFontHost_fontconfig.cpp index 076cb02..8c28dba 100644 --- a/skia/ext/SkFontHost_fontconfig.cpp +++ b/skia/ext/SkFontHost_fontconfig.cpp @@ -127,7 +127,6 @@ public: // static SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, const char familyName[], - const void* data, size_t bytelength, SkTypeface::Style style) { std::string resolved_family_name; @@ -150,7 +149,7 @@ SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace, unsigned filefaceid; if (!GetFcImpl()->Match(NULL, &filefaceid, false, -1, /* no filefaceid */ - resolved_family_name, data, bytelength, + resolved_family_name, NULL, 0, &bold, &italic)) { return NULL; } diff --git a/skia/skia.gyp b/skia/skia.gyp index 6f44c4d..9ea3364 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -305,6 +305,7 @@ '../third_party/skia/src/core/SkStrokerPriv.cpp', '../third_party/skia/src/core/SkStrokerPriv.h', '../third_party/skia/src/core/SkTextFormatParams.h', + '../third_party/skia/src/core/SkTLS.cpp', '../third_party/skia/src/core/SkTSearch.cpp', '../third_party/skia/src/core/SkTSort.h', '../third_party/skia/src/core/SkTemplatesPriv.h', @@ -424,6 +425,7 @@ '../third_party/skia/src/gpu/gl/GrGLContextInfo.h', '../third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', '../third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp', + '../third_party/skia/src/gpu/gl/GrGLDefines.h', '../third_party/skia/src/gpu/gl/GrGLIRect.h', '../third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp', '../third_party/skia/src/gpu/gl/GrGLIndexBuffer.h', @@ -440,6 +442,7 @@ '../third_party/skia/src/gpu/gl/GrGLTexture.cpp', '../third_party/skia/src/gpu/gl/GrGLTexture.h', '../third_party/skia/src/gpu/gl/GrGLUtil.cpp', + '../third_party/skia/src/gpu/gl/GrGLUtil.h', '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp', '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.h', '../third_party/skia/src/gpu/gl/GrGpuGL.cpp', @@ -654,6 +657,7 @@ '../third_party/skia/include/gpu/GrFontScaler.h', '../third_party/skia/include/gpu/gl/GrGLConfig.h', '../third_party/skia/include/gpu/gl/GrGLConfig_chrome.h', + '../third_party/skia/include/gpu/gl/GrGLFunctions.h', '../third_party/skia/include/gpu/gl/GrGLInterface.h', '../third_party/skia/include/gpu/GrGlyph.h', '../third_party/skia/include/gpu/GrInstanceCounter.h', |