Skia roll fbd3576:c773390

https://skia.googlesource.com/skia/+log/fbd3576a18799da88988ef26fa9bce09e8ebba37..c773390eefe70d13faab147a70bd9319b9ac3afb CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_layout_rel TBR=bsalomon@google.com BUG= Review URL: https://codereview.chromium.org/467363002 Cr-Commit-Position: refs/heads/master@{#289548} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289548 0039d316-1c4b-4281-b951-d872f2087c98
markYoungH · Aug 14, 2014 · 2dc1e10 · 2dc1e10
1 parent d8be320
commit 2dc1e10
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/DEPS b/DEPS
@@ -46,7 +46,7 @@ vars = {
   "lss_revision": "31",
   "sfntly_revision": "239",
   "lighttpd_revision": "33737",
-  "skia_revision": "fbd3576a18799da88988ef26fa9bce09e8ebba37",
+  "skia_revision": "c773390eefe70d13faab147a70bd9319b9ac3afb",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
@@ -444,7 +444,6 @@ component("skia") {
   }
   if (!is_android) {
     sources -= [
-      "//third_party/skia/src/ports/SkFontConfigInterface_android.cpp",
       "//third_party/skia/src/ports/SkFontConfigParser_android.cpp",
       "//third_party/skia/src/ports/SkFontMgr_android.cpp",
     ]
@@ -457,14 +456,14 @@ component("skia") {
 
   if (!is_linux) {
     sources -= [
+      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
     ]
   }
 
   if (!is_linux && !is_android) {
     sources -= [
-      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
     ]

diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi
@@ -13,7 +13,6 @@
     '<(skia_src_path)/fonts/SkRemotableFontMgr.cpp',
     '<(skia_src_path)/images/SkScaledBitmapSampler.cpp',
     '<(skia_src_path)/images/SkScaledBitmapSampler.h',
-    '<(skia_src_path)/ports/SkFontConfigInterface_android.cpp',
     '<(skia_src_path)/ports/SkFontConfigInterface_direct.cpp',
     '<(skia_src_path)/ports/SkFontConfigParser_android.cpp',
     '<(skia_src_path)/ports/SkFontHost_fontconfig.cpp',

diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
@@ -35,7 +35,6 @@
 
     '../third_party/skia/src/opts/opts_check_x86.cpp',
 
-    '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp',
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
 
     '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
@@ -256,14 +255,14 @@
     [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
+        '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
         '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
       ],
     }],
     [ 'OS=="win" or OS=="mac" or OS=="ios"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
-        '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
 
       ],
     }],