diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 14:26:46 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 14:26:46 +0000 |
| commit | effc04548f44a74d678238c3efdc464e6468256c (patch) | |
| tree | 81898f56ef41817b1e2b52bd07845529107d8256 /skia | |
| parent | 7e56eb7bd48e500b3d100ece464d3694c7e809a0 (diff) | |
| download | chromium_src-effc04548f44a74d678238c3efdc464e6468256c.zip chromium_src-effc04548f44a74d678238c3efdc464e6468256c.tar.gz chromium_src-effc04548f44a74d678238c3efdc464e6468256c.tar.bz2 | |
Roll Skia DEPS to 7502
control: https://codereview.chromium.org/12087123/
Review URL: https://codereview.chromium.org/12096101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig.cpp | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/skia/ext/SkFontHost_fontconfig.cpp b/skia/ext/SkFontHost_fontconfig.cpp index 757672f..a209869 100644 --- a/skia/ext/SkFontHost_fontconfig.cpp +++ b/skia/ext/SkFontHost_fontconfig.cpp @@ -32,7 +32,7 @@ #include <unistd.h> #include "base/compiler_specific.h" -#include "third_party/skia/src/ports/SkFontDescriptor.h" +#include "third_party/skia/src/core/SkFontDescriptor.h" #include "SkFontHost.h" #include "SkStream.h" #include "SkFontHost_fontconfig_control.h" diff --git a/skia/skia.gyp b/skia/skia.gyp index c45bb82..fa555c4 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -88,8 +88,6 @@ '../third_party/skia/src/pdf/SkPDFUtils.h', '../third_party/skia/src/ports/FontHostConfiguration_android.cpp', - '../third_party/skia/src/ports/SkFontDescriptor.cpp', - '../third_party/skia/src/ports/SkFontDescriptor.h', #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', |