diff options
| -rw-r--r-- | DEPS | 12 | ||||
| -rw-r--r-- | skia/BUILD.gn | 577 | ||||
| -rw-r--r-- | skia/skia_gn_files.gypi | 43 |
3 files changed, 628 insertions, 4 deletions
@@ -4,18 +4,18 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', 'pdfium_git': 'https://pdfium.googlesource.com', - 'build_revision': '28e8fda8744c8c44bac72eee610642798daf2705', - 'buildtools_revision': '5378d73123b64907773cc5c1bb027b2f765ff00a', + 'build_revision': 'c557a3544d31513394681f40c8c2512cf7ddcb9e', + 'buildtools_revision': '309289315767f615256eada4653b4917cf148c8e', 'clang_revision': 'b6f620b311665e2d96d0921833f54295b9bbf925', 'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df', + 'gen_library_loader_revision': '916d4acd8b2cde67a390737dfba90b3c37de23a1', 'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271', 'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038', 'icu_revision': 'c291cde264469b20ca969ce8832088acb21e0c48', 'pdfium_tests_revision': '7e5050a49256a7350df9b8d7ad86e911eb83c021', - 'skia_revision': '0a291c7b7eea1807bd58bdaa60c258fd0ebeb257', + 'skia_revision': '6f47dbaff54a7705ef3e98f1f65c765e56fd9bd0', 'trace_event_revision': 'd83d44b13d07c2fd0a40101a7deef9b93b841732', 'v8_revision': '5cd0d8f27e3f740179a8a3de7b9d2c0cfae7afb9', - } deps = { @@ -43,6 +43,10 @@ deps = { "tools/clang": Var('chromium_git') + "/chromium/src/tools/clang@" + Var('clang_revision'), + "tools/generate_library_loader": + Var('chromium_git') + "/chromium/src/tools/generate_library_loader@" + + Var('gen_library_loader_revision'), + "tools/gyp": Var('chromium_git') + "/external/gyp", diff --git a/skia/BUILD.gn b/skia/BUILD.gn new file mode 100644 index 0000000000..7fb49b8e40 --- /dev/null +++ b/skia/BUILD.gn @@ -0,0 +1,577 @@ +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/features.gni") +import("//build/config/ui.gni") +import("//testing/test.gni") + +if (current_cpu == "arm") { + import("//build/config/arm.gni") +} +if (current_cpu == "mipsel" || current_cpu == "mips64el") { + import("//build/config/mips.gni") +} + +skia_support_gpu = !is_ios +skia_support_pdf = false #!is_ios && (enable_basic_printing || enable_print_preview) + +# The list of Skia core sources that are to be set for chromium. +gypi_skia_core = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//third_party/skia/gyp/core.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "//third_party/skia/gyp/core.gypi" ]) + +# The list of Skia gpu sources that are to be set for chromium. +if (skia_support_gpu) { + gypi_skia_gpu = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//third_party/skia/gyp/gpu.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "//third_party/skia/gyp/gpu.gypi" ]) +} + +# The list of Skia pdf sources that are to be set for chromium. +if (skia_support_pdf) { + gypi_skia_pdf = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//third_party/skia/gyp/pdf.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "//third_party/skia/gyp/pdf.gypi" ]) +} + +# The list of Skia effects that are to be set for chromium. +gypi_skia_effects = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//third_party/skia/gyp/effects.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "//third_party/skia/gyp/effects.gypi" ]) + +# The list of Skia utils that are to be set for chromium. +gypi_skia_utils = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//third_party/skia/gyp/utils.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "//third_party/skia/gyp/utils.gypi" ]) + +gypi_skia_opts = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//third_party/skia/gyp/opts.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "//third_party/skia/gyp/opts.gypi" ]) + +# The list of Skia files is kept in skia_gn_files.gypi. Read it. +gypi_values = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("skia_gn_files.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src", + ], + "scope", + [ "skia_gn_files.gypi" ]) + +# External-facing config for dependent code. +config("skia_config") { + include_dirs = [ + "config", + "ext", + "//third_party/skia/include/c", + "//third_party/skia/include/config", + "//third_party/skia/include/core", + "//third_party/skia/include/effects", + "//third_party/skia/include/images", + "//third_party/skia/include/lazy", + "//third_party/skia/include/pathops", + "//third_party/skia/include/pdf", + "//third_party/skia/include/pipe", + "//third_party/skia/include/ports", + "//third_party/skia/include/utils", + ] + + defines = [] + + if (skia_support_gpu) { + include_dirs += [ + "//third_party/skia/include/gpu", + "//third_party/skia/src/gpu", + ] + defines += [ "SK_SUPPORT_GPU=1" ] + } else { + defines += [ "SK_SUPPORT_GPU=0" ] + } + + if (is_android) { + defines += [ + "SK_BUILD_FOR_ANDROID", + "USE_CHROMIUM_SKIA", + ] + } + + if (is_mac) { + defines += [ "SK_BUILD_FOR_MAC" ] + } + + if (is_win) { + defines += [ "GR_GL_FUNCTION_TYPE=__stdcall" ] + } +} + +# Internal-facing config for Skia library code. +config("skia_library_config") { + # These include directories are only included for Skia code and are not + # exported to dependents. It's not clear if this is on purpose, but this + # matches the GYP build. + include_dirs = [ + "//third_party/skia/include/private", + "//third_party/skia/include/client/android", + "//third_party/skia/src/core", + "//third_party/skia/src/image", + "//third_party/skia/src/opts", + "//third_party/skia/src/pdf", + "//third_party/skia/src/ports", + "//third_party/skia/src/sfnt", + "//third_party/skia/src/utils", + "//third_party/skia/src/lazy", + ] + if (is_mac || is_ios) { + include_dirs += [ "//third_party/skia/include/utils/mac" ] + } + if (is_mac) { + include_dirs += [ "//third_party/skia/include/utils/ios" ] + } + + defines = [] + + if (current_cpu == "arm") { + if (arm_use_neon) { + defines += [ "SK_ARM_HAS_NEON" ] + } else if (arm_optionally_use_neon) { + defines += [ "SK_ARM_HAS_OPTIONAL_NEON" ] + } + } + + # Settings for text blitting, chosen to approximate the system browser. + if (is_linux) { + defines += [ + "SK_GAMMA_EXPONENT=1.2", + "SK_GAMMA_CONTRAST=0.2", + ] + } else if (is_android) { + defines += [ + "SK_GAMMA_APPLY_TO_A8", + "SK_GAMMA_EXPONENT=1.4", + "SK_GAMMA_CONTRAST=0.0", + ] + } else if (is_win) { + defines += [ + "SK_GAMMA_SRGB", + "SK_GAMMA_CONTRAST=0.5", + ] + } else if (is_mac) { + defines += [ + "SK_GAMMA_SRGB", + "SK_GAMMA_CONTRAST=0.0", + ] + } + + if (is_android) { + defines += [ + # Android devices are typically more memory constrained, so default to a + # smaller glyph cache (it may be overriden at runtime when the renderer + # starts up, depending on the actual device memory). + "SK_DEFAULT_FONT_CACHE_LIMIT=1048576", # 1024 * 1024 + ] + } else { + defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ] # 20 * 1024 * 1024 + } + + if (is_win) { + include_dirs += [ + "//third_party/skia/include/utils/win", + "//third_party/skia/src/utils/win", + ] + + defines += [ + # On windows, GDI handles are a scarse system-wide resource so we have to + # keep the glyph cache, which holds up to 4 GDI handles per entry, to a + # fairly small size. http://crbug.com/314387 + "SK_DEFAULT_FONT_CACHE_COUNT_LIMIT=256", + ] + + cflags = [ + "/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)' + "/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit). + "/wd4341", # signed value is out of range for enum constant. + "/wd4345", # Object is default-initialized if initialization is omitted. + "/wd4390", # ';'empty statement found in looping;is it what was intended? + "/wd4554", # 'operator' : check operator precedence for possible error + "/wd4748", # compiler will disable optimizations if a function has inline + # assembly code contains flow control(jmp or jcc) statements. + + "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). + ] + } +} + +component("skia") { + sources = [ + # Chrome sources. + "config/SkUserConfig.h", + "ext/google_logging.cc", + ] + + # The skia gypi values are relative to the skia_dir, so we need to rebase. + sources += gypi_skia_core.sources + sources += gypi_skia_effects.sources + sources += gypi_skia_utils.sources + sources += gypi_values.skia_library_sources + + # This and skia_opts are really the same conceptual target so share headers. + allow_circular_includes_from = [ ":skia_opts" ] + + if (current_cpu == "arm") { + sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ] + } + + # GPU + if (skia_support_gpu) { + sources += gypi_skia_gpu.skgpu_sources + sources += gypi_skia_gpu.skgpu_null_gl_sources + } + + # Remove unused util files include in utils.gypi + sources -= [ + "//third_party/skia/src/utils/SkBoundaryPatch.cpp", + "//third_party/skia/src/utils/SkCamera.cpp", + "//third_party/skia/src/utils/SkDumpCanvas.cpp", + "//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/SkMeshUtils.cpp", + "//third_party/skia/src/utils/SkNinePatch.cpp", + "//third_party/skia/src/utils/SkOSFile.cpp", + "//third_party/skia/src/utils/SkParsePath.cpp", + + #testing + "//third_party/skia/src/fonts/SkGScalerContext.cpp", + ] + + if (is_win) { + sources -= [ + # Keeping _win.cpp + "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp", + ] + } else { + sources -= [ + # Keeping _pthread.cpp + "//third_party/skia/src/utils/SkThreadUtils_win.cpp", + ] + } + + # need separate win section to handle chromes auto gn filter + # (build/config/BUILDCONFIG.gn) + if (is_win) { + sources -= [ + #windows + "//third_party/skia/src/utils/win/SkAutoCoInitialize.cpp", + "//third_party/skia/src/utils/win/SkIStream.cpp", + "//third_party/skia/src/utils/win/SkWGL_win.cpp", + ] + } + + # Fixup skia library sources. + if (is_win) { + sources -= [ + "//third_party/skia/src/ports/SkOSFile_posix.cpp", + "//third_party/skia/src/ports/SkTLS_pthread.cpp", + ] + } else { + sources -= [ + "//third_party/skia/src/ports/SkFontHost_win.cpp", + "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp", + "//third_party/skia/src/ports/SkOSFile_win.cpp", + "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp", + "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp", + "//third_party/skia/src/ports/SkTLS_win.cpp", + "//third_party/skia/src/ports/SkTypeface_win_dw.cpp", + ] + } + if (!is_android) { + sources -= [ + "//third_party/skia/src/ports/SkFontMgr_android.cpp", + "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp", + "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", + ] + } + if (!is_mac) { + sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] + } + + if (!is_linux) { + sources -= [ + "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp", + "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", + ] + } + + # Add the files for the SkFontMgr_Android. This is used to emulate android + # fonts on linux. See content/zygote/zygote_main_linux.cc + if (is_linux) { + sources += [ + "//third_party/skia/src/ports/SkFontMgr_android.cpp", + "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", + ] + } + + if (!is_linux && !is_android) { + sources -= [ + "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", + "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", + ] + } + + if (is_clang && !is_nacl) { + # Skia won't compile with some of the more strict clang warnings. + # e.g. it does: + # SkASSERT(!"sk_out_of_memory"); + configs -= [ "//build/config/clang:extra_warnings" ] + } + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + public_configs = [ ":skia_config" ] + + deps = [ + ":skia_opts", + "../third_party:fx_zlib", + ] + + if (is_linux) { + if (use_pango) { + configs += [ "//build/config/linux/pangocairo" ] + } + deps += [ + "//build/linux:fontconfig", + "//build/linux:freetype2", + + # "//third_party/expat", + "//third_party/icu:icuuc", + ] + } + + if (is_android) { + set_sources_assignment_filter([]) + set_sources_assignment_filter(sources_assignment_filter) + deps += [ + "//third_party/android_tools:cpu_features", + "//third_party/expat", + "//third_party/freetype-android:freetype", + ] + } + + if (skia_support_pdf) { + deps += [ "//third_party/sfntly" ] + sources += gypi_skia_pdf.sources + } else { + sources += [ "//third_party/skia/src/pdf/SkDocument_PDF_None.cpp" ] + } + + if (is_android && !is_debug) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } + + if (is_ios) { + libs = [ "ImageIO.framework" ] + set_sources_assignment_filter([]) + sources += [ + "//third_party/skia/src/ports/SkFontHost_mac.cpp", + "//third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp", + "//third_party/skia/src/utils/mac/SkStream_mac.cpp", + ] + set_sources_assignment_filter(sources_assignment_filter) + + # To disable warning "CGContextSelectFont' is deprecated" + cflags = [ "-Wno-deprecated-declarations" ] + } +} + +# Separated out so it can be compiled with different flags for SSE. +if (current_cpu == "x86" || current_cpu == "x64") { + source_set("skia_opts_sse3") { + sources = gypi_skia_opts.ssse3_sources + if (!is_win || is_clang) { + cflags = [ "-mssse3" ] + } + if (is_win) { + defines = [ "SK_CPU_SSE_LEVEL=31" ] + } + visibility = [ ":skia_opts" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + } + source_set("skia_opts_sse41") { + sources = gypi_skia_opts.sse41_sources + if (!is_win || is_clang) { + cflags = [ "-msse4.1" ] + } + if (is_win) { + defines = [ "SK_CPU_SSE_LEVEL=41" ] + } + visibility = [ ":skia_opts" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + } + source_set("skia_opts_sse42") { + sources = gypi_skia_opts.sse42_sources + if (!is_win || is_clang) { + cflags = [ "-msse4.2" ] + } + if (is_win) { + defines = [ "SK_CPU_SSE_LEVEL=42" ] + } + visibility = [ ":skia_opts" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + } + source_set("skia_opts_avx") { + sources = gypi_skia_opts.avx_sources + if (!is_win) { + cflags = [ "-mavx" ] + } + if (is_win) { + cflags = [ "/arch:AVX" ] + } + visibility = [ ":skia_opts" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + } + source_set("skia_opts_avx2") { + sources = gypi_skia_opts.avx2_sources + if (!is_win) { + cflags = [ "-mavx2" ] + } + if (is_win) { + cflags = [ "/arch:AVX2" ] + } + visibility = [ ":skia_opts" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + } +} +source_set("skia_opts") { + cflags = [] + defines = [] + + if (current_cpu == "x86" || current_cpu == "x64") { + sources = gypi_skia_opts.sse2_sources + deps = [ + ":skia_opts_avx", + ":skia_opts_avx2", + ":skia_opts_sse3", + ":skia_opts_sse41", + ":skia_opts_sse42", + ] + } else if (current_cpu == "arm") { + # The assembly uses the frame pointer register (r7 in Thumb/r11 in + # ARM), the compiler doesn't like that. + cflags += [ "-fomit-frame-pointer" ] + + if (arm_version >= 7) { + sources = gypi_skia_opts.armv7_sources + if (arm_use_neon || arm_optionally_use_neon) { + sources += gypi_skia_opts.neon_sources + + # Root build config sets -mfpu=$arm_fpu, which we expect to be neon + # when running this. + if (!arm_use_neon) { + configs -= [ "//build/config/compiler:compiler_arm_fpu" ] + cflags += [ "-mfpu=neon" ] + } + } + } else { + sources = gypi_skia_opts.none_sources + } + } else if (current_cpu == "arm64") { + sources = gypi_skia_opts.arm64_sources + } else if (current_cpu == "mipsel") { + cflags += [ "-fomit-frame-pointer" ] + + if (mips_dsp_rev >= 1) { + sources = gypi_skia_opts.mips_dsp_sources + } else { + sources = gypi_skia_opts.none_sources + } + } else if (current_cpu == "mips64el") { + cflags += [ "-fomit-frame-pointer" ] + sources = gypi_skia_opts.none_sources + } else { + assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp") + } + + if (is_android && !is_debug) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + ":skia_library_config", + "//build/config/compiler:no_chromium_code", + ] + + visibility = [ ":skia" ] +} diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi new file mode 100644 index 0000000000..42bdc47a48 --- /dev/null +++ b/skia/skia_gn_files.gypi @@ -0,0 +1,43 @@ +# This file is read into the GN build. + +# Files are relative to third_party/skia. +{ + 'skia_library_sources': [ + '<(skia_src_path)/ports/SkImageGenerator_none.cpp', + + '<(skia_src_path)/fonts/SkFontMgr_fontconfig.cpp', + '<(skia_src_path)/fonts/SkFontMgr_indirect.cpp', + '<(skia_src_path)/fonts/SkRemotableFontMgr.cpp', + '<(skia_src_path)/ports/SkFontConfigInterface_direct.cpp', + '<(skia_src_path)/ports/SkFontConfigInterface_direct_factory.cpp', + '<(skia_src_path)/ports/SkFontHost_fontconfig.cpp', + '<(skia_src_path)/ports/SkFontHost_FreeType_common.cpp', + '<(skia_src_path)/ports/SkFontHost_FreeType.cpp', + '<(skia_src_path)/ports/SkFontHost_mac.cpp', + '<(skia_src_path)/ports/SkFontHost_win.cpp', + '<(skia_src_path)/ports/SkFontMgr_android.cpp', + '<(skia_src_path)/ports/SkFontMgr_android_factory.cpp', + '<(skia_src_path)/ports/SkFontMgr_android_parser.cpp', + '<(skia_src_path)/ports/SkFontMgr_win_dw.cpp', + '<(skia_src_path)/ports/SkGlobalInitialization_default.cpp', + '<(skia_src_path)/ports/SkImageEncoder_none.cpp', + '<(skia_src_path)/ports/SkOSFile_posix.cpp', + '<(skia_src_path)/ports/SkRemotableFontMgr_win_dw.cpp', + '<(skia_src_path)/ports/SkOSFile_stdio.cpp', + '<(skia_src_path)/ports/SkOSFile_win.cpp', + '<(skia_src_path)/ports/SkScalerContext_win_dw.cpp', + '<(skia_src_path)/ports/SkTLS_pthread.cpp', + '<(skia_src_path)/ports/SkTLS_win.cpp', + '<(skia_src_path)/ports/SkTypeface_win_dw.cpp', + '<(skia_src_path)/sfnt/SkOTTable_name.cpp', + '<(skia_src_path)/sfnt/SkOTUtils.cpp', + + #mac + '<(skia_src_path)/utils/mac/SkStream_mac.cpp', + + #windows + + #testing + '<(skia_src_path)/fonts/SkGScalerContext.cpp', + ], +} |