Index: skia/BUILD.gn |
diff --git a/skia/BUILD.gn b/skia/BUILD.gn |
index aede7dc1aca169f2908955fa6df509c2fe11c7a0..472a8cf755eb520b87696c89e83d553b14a1dd72 100644 |
--- a/skia/BUILD.gn |
+++ b/skia/BUILD.gn |
@@ -251,6 +251,9 @@ component("skia") { |
sources = [ |
# Chrome sources. |
"config/SkUserConfig.h", |
+ "ext/SkDiscardableMemory_chrome.cc", |
+ "ext/SkDiscardableMemory_chrome.h", |
+ "ext/SkMemory_new_handler.cpp", |
"ext/analysis_canvas.cc", |
"ext/analysis_canvas.h", |
"ext/benchmarking_canvas.cc", |
@@ -279,15 +282,12 @@ component("skia") { |
"ext/recursive_gaussian_convolution.cc", |
"ext/recursive_gaussian_convolution.h", |
"ext/refptr.h", |
- "ext/SkDiscardableMemory_chrome.h", |
- "ext/SkDiscardableMemory_chrome.cc", |
- "ext/SkMemory_new_handler.cpp", |
"ext/skia_utils_base.cc", |
"ext/skia_utils_base.h", |
- "ext/skia_utils_ios.mm", |
"ext/skia_utils_ios.h", |
- "ext/skia_utils_mac.mm", |
+ "ext/skia_utils_ios.mm", |
"ext/skia_utils_mac.h", |
+ "ext/skia_utils_mac.mm", |
"ext/skia_utils_win.cc", |
"ext/skia_utils_win.h", |
] |
@@ -317,7 +317,6 @@ component("skia") { |
# Remove unused util files include in utils.gypi |
sources -= [ |
"//third_party/skia/include/utils/SkBoundaryPatch.h", |
- "//third_party/skia/include/utils/SkFrontBufferedStream.h", |
"//third_party/skia/include/utils/SkCamera.h", |
"//third_party/skia/include/utils/SkCanvasStateUtils.h", |
"//third_party/skia/include/utils/SkCubicInterval.h", |
@@ -325,24 +324,24 @@ component("skia") { |
"//third_party/skia/include/utils/SkDebugUtils.h", |
"//third_party/skia/include/utils/SkDumpCanvas.h", |
"//third_party/skia/include/utils/SkEventTracer.h", |
+ "//third_party/skia/include/utils/SkFrontBufferedStream.h", |
"//third_party/skia/include/utils/SkInterpolator.h", |
"//third_party/skia/include/utils/SkLayer.h", |
"//third_party/skia/include/utils/SkMeshUtils.h", |
"//third_party/skia/include/utils/SkNinePatch.h", |
- "//third_party/skia/include/utils/SkParse.h", |
"//third_party/skia/include/utils/SkParsePaint.h", |
"//third_party/skia/include/utils/SkParsePath.h", |
"//third_party/skia/include/utils/SkRandom.h", |
"//third_party/skia/src/utils/SkBitmapHasher.cpp", |
"//third_party/skia/src/utils/SkBitmapHasher.h", |
"//third_party/skia/src/utils/SkBoundaryPatch.cpp", |
- "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", |
"//third_party/skia/src/utils/SkCamera.cpp", |
"//third_party/skia/src/utils/SkCanvasStack.h", |
"//third_party/skia/src/utils/SkCubicInterval.cpp", |
"//third_party/skia/src/utils/SkCullPoints.cpp", |
"//third_party/skia/src/utils/SkDumpCanvas.cpp", |
"//third_party/skia/src/utils/SkFloatUtils.h", |
+ "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", |
"//third_party/skia/src/utils/SkInterpolator.cpp", |
"//third_party/skia/src/utils/SkLayer.cpp", |
"//third_party/skia/src/utils/SkMD5.cpp", |
@@ -350,8 +349,6 @@ component("skia") { |
"//third_party/skia/src/utils/SkMeshUtils.cpp", |
"//third_party/skia/src/utils/SkNinePatch.cpp", |
"//third_party/skia/src/utils/SkOSFile.cpp", |
- "//third_party/skia/src/utils/SkParse.cpp", |
- "//third_party/skia/src/utils/SkParseColor.cpp", |
"//third_party/skia/src/utils/SkParsePath.cpp", |
"//third_party/skia/src/utils/SkPathUtils.cpp", |
"//third_party/skia/src/utils/SkSHA1.cpp", |
@@ -360,8 +357,8 @@ component("skia") { |
"//third_party/skia/src/utils/SkTLogic.h", |
# We don't currently need to change thread affinity, so leave out this complexity for now. |
- "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", |
"//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp", |
+ "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", |
#testing |
"//third_party/skia/src/fonts/SkGScalerContext.cpp", |
@@ -404,8 +401,8 @@ component("skia") { |
if (is_win) { |
sources -= [ |
"//third_party/skia/src/ports/SkOSFile_posix.cpp", |
- "//third_party/skia/src/ports/SkTime_Unix.cpp", |
"//third_party/skia/src/ports/SkTLS_pthread.cpp", |
+ "//third_party/skia/src/ports/SkTime_Unix.cpp", |
] |
} else { |
sources -= [ |
@@ -432,16 +429,16 @@ 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", |
+ "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", |
] |
} |
if (!is_linux && !is_android) { |
sources -= [ |
- "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", |
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp", |
+ "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", |
] |
} |