diff --git a/BUILD.gn b/BUILD.gn index 58204204ef9c78fc6024dfa7e7972d973ca62d41..8d5da39c670ea6703130135c0623bf7bd62721ac 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -59,6 +59,8 @@ template("make_skia_deps") { deps = [ ":ace_fontmgr_$platform", ":ace_gif", + + #":ace_gpu", ":ace_heif", ":ace_jpeg", ":ace_libexpat", @@ -80,9 +82,7 @@ template("make_skia_deps") { ":ace_xml_$platform", ] - public_configs += [ - ":ace_svg_model_config", - ] + public_configs += [ ":ace_svg_model_config" ] if (is_standard_system) { deps += [ ":make_third_party_skia_include_dir" ] @@ -90,11 +90,14 @@ template("make_skia_deps") { } } -make_skia_deps("ohos") {} +make_skia_deps("ohos") { +} -make_skia_deps("windows") {} +make_skia_deps("windows") { +} -make_skia_deps("mac") {} +make_skia_deps("mac") { +} # ------------------------------------------------ # Main block end of skia @@ -161,9 +164,10 @@ config("flutter_config") { "-fvisibility-inlines-hidden", "-Os", ] + defines = [] if (use_mingw_win || use_mac) { - defines = ace_common_defines + defines += ace_common_defines cflags_cc += [ "-std=c++17", @@ -177,7 +181,7 @@ config("flutter_config") { "-Wno-thread-safety-attributes", "-Wno-thread-safety-analysis", ] - defines = [ "SK_BUILD_FOR_UNIX" ] + defines += [ "SK_BUILD_FOR_UNIX" ] } } @@ -353,8 +357,10 @@ template("flutter_engine_flow") { "engine/flutter/flow/layers/clip_rrect_layer.cc", "engine/flutter/flow/layers/color_filter_layer.cc", "engine/flutter/flow/layers/container_layer.cc", + "engine/flutter/flow/layers/filter_layer.cc", "engine/flutter/flow/layers/layer.cc", "engine/flutter/flow/layers/layer_tree.cc", + "engine/flutter/flow/layers/mask_layer.cc", "engine/flutter/flow/layers/opacity_layer.cc", "engine/flutter/flow/layers/performance_overlay_layer.cc", "engine/flutter/flow/layers/physical_shape_layer.cc", @@ -416,6 +422,7 @@ template("flutter_engine_shell") { "engine/flutter/shell/common/vsync_waiter_fallback.cc", # only support gl and software + "engine/flutter/shell/gpu/gpu_surface_gl.cc", "engine/flutter/shell/gpu/gpu_surface_gl_delegate.cc", "engine/flutter/shell/gpu/gpu_surface_software.cc", "engine/flutter/shell/gpu/gpu_surface_software_delegate.cc", @@ -445,7 +452,7 @@ template("flutter_engine_shell") { defines += [ "UNICODE" ] } else if (is_standard_system) { include_dirs = [ "//utils/native/base/include" ] - deps += [ "//foundation/graphic/standard:libwms_client" ] + deps += [ "//foundation/graphic/standard:libwmclient" ] sources += [ "engine/flutter/shell/platform/ohos/ohos_shell_holder.cc", "engine/flutter/shell/platform/ohos/ohos_surface_software.cc", @@ -2113,6 +2120,12 @@ ohos_source_set("ace_skia_core") { config("ace_skia_ext_config") { visibility = [ ":*" ] include_dirs = [ + "//third_party/aosp/external/skia/src/core", + "//third_party/aosp/external/skia/src/opts", + "//third_party/aosp/external/skia/src/shaders", + "//third_party/aosp/external/skia/src/gpu", + "$libs_root/shared_library/${target_os}_${target_cpu}/include/frameworks/native/libs/nativewindow/include", + "$libs_root/shared_library/${target_os}_${target_cpu}/include/frameworks/native/libs/arect/include", "$flutter_root", "skia", "engine", @@ -2127,11 +2140,11 @@ ohos_source_set("ace_skia_ext") { sources = [ # enable ext utils - "skia/src/core/SkArenaAlloc.cpp", - "skia/src/core/SkOpts.cpp", - "skia/src/core/SkTSearch.cpp", - "skia/src/utils/SkBase64.cpp", - "skia/src/utils/SkParsePath.cpp", + "//third_party/aosp/external/skia/src/core/SkArenaAlloc.cpp", + "//third_party/aosp/external/skia/src/core/SkOpts.cpp", + "//third_party/aosp/external/skia/src/core/SkTSearch.cpp", + "//third_party/aosp/external/skia/src/utils/SkBase64.cpp", + "//third_party/aosp/external/skia/src/utils/SkParsePath.cpp", # use ohos fontmgr "skia/src/ports/SkFontMgr_ohos.cpp", @@ -2633,9 +2646,7 @@ config("ace_gpu_config") { } ohos_source_set("ace_gpu") { - configs = [ - ":ace_gpu_config", - ] + configs = [ ":ace_gpu_config" ] configs += [ ":reduce_eh_frame_config" ] sources = [ @@ -3238,9 +3249,7 @@ template("ace_xml") { forward_variables_from(invoker, "*") ohos_source_set(target_name) { - configs = [ - ":ace_xml_config", - ] + configs = [ ":ace_xml_config" ] configs += [ ":reduce_eh_frame_config" ] defines += invoker.defines diff --git a/OAT.xml b/OAT.xml index 240bcee2b70ef59e93d48e26f0f853478a9b417b..9c26bd51bb9fc31d2093fd64f0cb7ff3d8092bed 100644 --- a/OAT.xml +++ b/OAT.xml @@ -59,24 +59,34 @@ Note:If the text contains special characters, please escape them according to th engine/flutter/LICENSE|skia/LICENSE - - - --> - - - - - - - - - - - - - - - + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,9 +99,14 @@ Note:If the text contains special characters, please escape them according to th + + + + + @@ -103,9 +118,14 @@ Note:If the text contains special characters, please escape them according to th - + + + + + + @@ -128,12 +148,22 @@ Note:If the text contains special characters, please escape them according to th - + + + + + + + + + + + @@ -167,26 +197,146 @@ Note:If the text contains special characters, please escape them according to th - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/engine/flutter/BUILD.gn b/engine/flutter/BUILD.gn index 3e6eef501f7e6d8d48ef4fb01ffe375b1b1e2183..61c5582ac4a06e303241f641dbe8a3f9ec12dcb1 100644 --- a/engine/flutter/BUILD.gn +++ b/engine/flutter/BUILD.gn @@ -91,9 +91,7 @@ config("config") { config("export_dynamic_symbols") { if (is_linux) { - inputs = [ - "$flutter_root/common/exported_symbols.sym", - ] + inputs = [ "$flutter_root/common/exported_symbols.sym" ] ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ] } } @@ -101,7 +99,5 @@ config("export_dynamic_symbols") { group("dist") { testonly = true - deps = [ - "$flutter_root/sky/dist", - ] + deps = [ "$flutter_root/sky/dist" ] } diff --git a/engine/flutter/common/BUILD.gn b/engine/flutter/common/BUILD.gn index b9b05073501d278ccb8cdf5f5e5de8b8a14c4a0e..8875e3e194a58e3e6e479f347d1941aba415732c 100644 --- a/engine/flutter/common/BUILD.gn +++ b/engine/flutter/common/BUILD.gn @@ -16,9 +16,7 @@ source_set("common") { "task_runners.h", ] - deps = [ - "$flutter_root/fml", - ] + deps = [ "$flutter_root/fml" ] public_configs = [ ":flutter_config", diff --git a/engine/flutter/flow/BUILD.gn b/engine/flutter/flow/BUILD.gn index 4028b566d87f75413e795e52191d3f69c7a9ea37..74e72d21e33c04c046e5f1aedff56c5d105b8245 100644 --- a/engine/flutter/flow/BUILD.gn +++ b/engine/flutter/flow/BUILD.gn @@ -30,10 +30,14 @@ source_set("flow") { "layers/color_filter_layer.h", "layers/container_layer.cc", "layers/container_layer.h", + "layers/filter_layer.cc", + "layers/filter_layer.h", "layers/layer.cc", "layers/layer.h", "layers/layer_tree.cc", "layers/layer_tree.h", + "layers/mask_layer.cc", + "layers/mask_layer.h", "layers/opacity_layer.cc", "layers/opacity_layer.h", "layers/performance_overlay_layer.cc", @@ -122,8 +126,8 @@ executable("flow_unittests") { ":flow", ":flow_fixtures", "$flutter_root/fml", + "$flutter_root/third_party/skia", "//third_party/dart/runtime:libdart_jit", # for tracing "//third_party/googletest:gtest", - "$flutter_root/third_party/skia", ] } diff --git a/engine/flutter/flow/layers/filter_layer.cc b/engine/flutter/flow/layers/filter_layer.cc new file mode 100644 index 0000000000000000000000000000000000000000..531ac4322e768b50adcd34ea5e0656a9cae2087c --- /dev/null +++ b/engine/flutter/flow/layers/filter_layer.cc @@ -0,0 +1,20 @@ +// Copyright 2021 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "flutter/flow/layers/filter_layer.h" + +namespace flutter { + +void FilterLayer::Paint(PaintContext& context) const { + TRACE_EVENT0("flutter", "FilterLayer::Paint"); + FML_DCHECK(needs_painting()); + + auto& skCanvas = context.internal_nodes_canvas; + SkAutoCanvasRestore save(skCanvas, true); + skCanvas->saveLayer(nullptr, &filterPaint_); + + PaintChildren(context); +} + +} // namespace flutter diff --git a/engine/flutter/flow/layers/filter_layer.h b/engine/flutter/flow/layers/filter_layer.h new file mode 100644 index 0000000000000000000000000000000000000000..ec3f863789ecb384c6668b510f7ebf244f4efc5f --- /dev/null +++ b/engine/flutter/flow/layers/filter_layer.h @@ -0,0 +1,29 @@ +// Copyright 2021 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef FLUTTER_FLOW_LAYERS_FILTER_LAYER_H_ +#define FLUTTER_FLOW_LAYERS_FILTER_LAYER_H_ + +#include "flutter/flow/layers/container_layer.h" + +#include "third_party/skia/include/core/SkPaint.h" + +namespace flutter { + +class FilterLayer : public ContainerLayer { +public: + FilterLayer(const SkPaint& filterPaint) : filterPaint_(filterPaint) {} + ~FilterLayer() override = default; + + void Paint(PaintContext& context) const override; + +private: + SkPaint filterPaint_; + + FML_DISALLOW_COPY_AND_ASSIGN(FilterLayer); +}; + +} // namespace flutter + +#endif // FLUTTER_FLOW_LAYERS_FILTER_LAYER_H_ diff --git a/engine/flutter/flow/layers/mask_layer.cc b/engine/flutter/flow/layers/mask_layer.cc new file mode 100644 index 0000000000000000000000000000000000000000..837c08c4073e95fbfe345ebade2bc31c2444e3cc --- /dev/null +++ b/engine/flutter/flow/layers/mask_layer.cc @@ -0,0 +1,60 @@ +// Copyright 2021 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "flutter/flow/layers/mask_layer.h" + +#include "third_party/skia/include/core/SkMaskFilter.h" +#include "third_party/skia/include/effects/SkLumaColorFilter.h" + +namespace flutter { + +void MaskLayer::Paint(PaintContext& context) const { + TRACE_EVENT0("flutter", "MaskLayer::Paint"); + FML_DCHECK(needs_painting()); + + if (isSvgMask_ && !svgDom_) { + return; + } + + auto& skCanvas = context.internal_nodes_canvas; + SkAutoCanvasRestore save(skCanvas, true); + SkRect maskBounds = paint_bounds(); + + skCanvas->saveLayer(maskBounds, nullptr); + int tmpLayer = skCanvas->getSaveCount(); + + SkPaint mask_filter; +#ifdef USE_SYSTEM_SKIA + auto filter = SkColorFilter::MakeComposeFilter(SkLumaColorFilter::Make(), + SkColorFilter::MakeSRGBToLinearGamma()); +#else + auto filter = SkColorFilters::Compose(SkLumaColorFilter::Make(), + SkColorFilters::SRGBToLinearGamma()); +#endif + mask_filter.setColorFilter(filter); + skCanvas->saveLayer(maskBounds, &mask_filter); + if (isSvgMask_) { + SkAutoCanvasRestore maskSave(skCanvas, true); + skCanvas->translate(maskBounds.fLeft + svgX_, maskBounds.fTop + svgY_); + skCanvas->scale(scaleX_, scaleY_); + svgDom_->render(skCanvas); + } else if (isGradientMask_) { + skCanvas->drawRect(maskBounds, maskPaint_); + } else if (isPathMask_) { + SkAutoCanvasRestore maskSave(skCanvas, true); + skCanvas->translate(maskBounds.fLeft, maskBounds.fTop); + skCanvas->drawPath(maskPath_, maskPaint_); + } + + // back to mask layer + skCanvas->restoreToCount(tmpLayer); + // create content layer + SkPaint maskPaint; + maskPaint.setBlendMode(SkBlendMode::kSrcIn); + skCanvas->saveLayer(maskBounds, &maskPaint); + skCanvas->clipRect(maskBounds, true); + PaintChildren(context); +} + +} // namespace flutter diff --git a/engine/flutter/flow/layers/mask_layer.h b/engine/flutter/flow/layers/mask_layer.h new file mode 100644 index 0000000000000000000000000000000000000000..feefede9f2f57f7cb42e8ac5151e54f37bdfebaf --- /dev/null +++ b/engine/flutter/flow/layers/mask_layer.h @@ -0,0 +1,45 @@ +// Copyright 2021 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef FLUTTER_FLOW_LAYERS_MASK_LAYER_H_ +#define FLUTTER_FLOW_LAYERS_MASK_LAYER_H_ + +#include "flutter/flow/layers/container_layer.h" + +#include "experimental/svg/model/SkSVGDOM.h" +#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkPath.h" + +namespace flutter { + +class MaskLayer : public ContainerLayer { + public: + MaskLayer(const SkPaint& maskPaint) + : isGradientMask_(true), maskPaint_(maskPaint) {} + MaskLayer(double x, double y, double scaleX, double scaleY, const sk_sp& svgDom) + : isSvgMask_(true), svgX_(x), svgY_(y), scaleX_(scaleX), scaleY_(scaleY), svgDom_(svgDom) {} + MaskLayer(const SkPaint& maskPaint, const SkPath& maskPath) + : isPathMask_(true), maskPaint_(maskPaint), maskPath_(maskPath) {} + ~MaskLayer() override = default; + + void Paint(PaintContext& context) const override; + + private: + bool isSvgMask_ = false; + bool isGradientMask_ = false; + bool isPathMask_ = false; + double svgX_ = 0.0f; + double svgY_ = 0.0f; + double scaleX_ = 1.0f; + double scaleY_ = 1.0f; + sk_sp svgDom_; + SkPaint maskPaint_; + SkPath maskPath_; + + FML_DISALLOW_COPY_AND_ASSIGN(MaskLayer); +}; + +} // namespace flutter + +#endif // FLUTTER_FLOW_LAYERS_MASK_LAYER_H_ diff --git a/engine/flutter/flow/ohos_layers/BUILD.gn b/engine/flutter/flow/ohos_layers/BUILD.gn index 6f4bc783a49838ee129361e1bb2c016b05c453d3..32032a240c39b414ee9584fc0d975d09f8bfea74 100644 --- a/engine/flutter/flow/ohos_layers/BUILD.gn +++ b/engine/flutter/flow/ohos_layers/BUILD.gn @@ -11,7 +11,7 @@ template("flutter_ohos_layers_set") { forward_variables_from(invoker, "*") ohos_source_set(target_name) { defines += invoker.defines - configs = [ "$flutter_root:flutter_config" ] + configs = [ "$ace_flutter_engine_root:flutter_config" ] sources = [ "backdrop_filter_layer.cpp", @@ -19,8 +19,10 @@ template("flutter_ohos_layers_set") { "clip_rect_layer.cpp", "clip_rrect_layer.cpp", "container_layer.cpp", + "filter_layer.cpp", "layer_tree.cpp", "layer_tree_builder.cpp", + "mask_layer.cpp", "opacity_layer.cpp", "picture_layer.cpp", "shader_mask_layer.cpp", @@ -29,7 +31,7 @@ template("flutter_ohos_layers_set") { "transform_layer.cpp", ] - deps = [ "$flutter_root:ace_skia_$platform" ] + deps = [ "$ace_flutter_engine_root:ace_skia_$platform" ] } } diff --git a/engine/flutter/flow/ohos_layers/filter_layer.cpp b/engine/flutter/flow/ohos_layers/filter_layer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e98df03b3df4febab5603bd1940aa150b5ab28d5 --- /dev/null +++ b/engine/flutter/flow/ohos_layers/filter_layer.cpp @@ -0,0 +1,20 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "flutter/flow/ohos_layers/filter_layer.h" + +#include "flutter/flow/ohos_layers/paint_context.h" + +namespace flutter::OHOS { + +void FilterLayer::Paint(const PaintContext& paintContext) const +{ + SkAutoCanvasRestore save(paintContext.skCanvas, true); + auto& skCanvas_ = paintContext.skCanvas; + skCanvas_->saveLayer(nullptr, &filterPaint_); + PaintChildren(paintContext); +} + +} // namespace flutter::OHOS \ No newline at end of file diff --git a/engine/flutter/flow/ohos_layers/filter_layer.h b/engine/flutter/flow/ohos_layers/filter_layer.h new file mode 100644 index 0000000000000000000000000000000000000000..34670d67059d21640054f136d8e9caf00245e4f3 --- /dev/null +++ b/engine/flutter/flow/ohos_layers/filter_layer.h @@ -0,0 +1,31 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef FLUTTER_FLOW_OHOS_LAYERS_FILTER_LAYER_H +#define FLUTTER_FLOW_OHOS_LAYERS_FILTER_LAYER_H + +#include "third_party/skia/include/core/SkPaint.h" + +#include "flutter/flow/ohos_layers/container_layer.h" + +namespace flutter::OHOS { + +class FilterLayer : public ContainerLayer { +public: + FilterLayer(const SkPaint& filterPaint) : filterPaint_(filterPaint) {} + + ~FilterLayer() override = default; + + void Paint(const PaintContext& paintContext) const override; + +private: + SkPaint filterPaint_; + + FML_DISALLOW_COPY_AND_ASSIGN(FilterLayer); +}; + +} // namespace flutter::OHOS + +#endif // FLUTTER_FLOW_OHOS_LAYERS_FILTER_LAYER_H \ No newline at end of file diff --git a/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp b/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp index f7b36eca6d4e5da2b8c2effc2133c96b37eda0c6..14b45babdfc40fbfdd6ad7ff3a6e23bdc8a44ce3 100644 --- a/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp +++ b/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp @@ -20,7 +20,9 @@ #include "flutter/flow/ohos_layers/clip_rrect_layer.h" #include "flutter/flow/ohos_layers/color_filter_layer.h" #include "flutter/flow/ohos_layers/container_layer.h" +#include "flutter/flow/ohos_layers/filter_layer.h" #include "flutter/flow/ohos_layers/layer.h" +#include "flutter/flow/ohos_layers/mask_layer.h" #include "flutter/flow/ohos_layers/opacity_layer.h" #include "flutter/flow/ohos_layers/picture_layer.h" #include "flutter/flow/ohos_layers/shader_mask_layer.h" @@ -57,6 +59,13 @@ void LayerTreeBuilder::PushClipRRect(const SkRRect& skRRect, int32_t clipBehavio PushLayer(layer); } +void LayerTreeBuilder::PushClipPath(const SkPath& skPath, int32_t clipBehavior) +{ + Clip clip_behavior = static_cast(clipBehavior); + auto layer = std::make_shared(skPath, clip_behavior); + PushLayer(layer); +} + void LayerTreeBuilder::PushOpacity(int32_t alpha, double dx, double dy) { auto layer = std::make_shared(alpha, SkPoint::Make(dx, dy)); @@ -77,6 +86,30 @@ void LayerTreeBuilder::PushShaderMask(sk_sp shader, double maskRectLef PushLayer(layer); } +void LayerTreeBuilder::PushSvgMask(const sk_sp& svgDom, double x, double y, double scaleX, double scaleY) +{ + auto layer = std::make_shared(x, y, scaleX, scaleY, svgDom); + PushLayer(layer); +} + +void LayerTreeBuilder::PushGradientColorMask(const SkPaint& maskPaint) +{ + auto layer = std::make_shared(maskPaint); + PushLayer(layer); +} + +void LayerTreeBuilder::PushPathMask(const SkPaint& maskPaint, const SkPath& maskPath) +{ + auto layer = std::make_shared(maskPaint, maskPath); + PushLayer(layer); +} + +void LayerTreeBuilder::PushFilter(const SkPaint& filterPaint) +{ + auto layer = std::make_shared(filterPaint); + PushLayer(layer); +} + void LayerTreeBuilder::AddPicture(double dx, double dy, sk_sp picture) { if (currentLayer_ == nullptr) { diff --git a/engine/flutter/flow/ohos_layers/layer_tree_builder.h b/engine/flutter/flow/ohos_layers/layer_tree_builder.h index cb1b101524c23b99a7b630dc1f9978265e014cd0..04b74511e02494012a08ec0bb733da9b88991b59 100644 --- a/engine/flutter/flow/ohos_layers/layer_tree_builder.h +++ b/engine/flutter/flow/ohos_layers/layer_tree_builder.h @@ -12,7 +12,10 @@ #include #include +#include "experimental/svg/model/SkSVGDOM.h" #include "third_party/skia/include/core/SkImageFilter.h" +#include "third_party/skia/include/core/SkPath.h" +#include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkRRect.h" #include "third_party/skia/include/core/SkShader.h" @@ -38,10 +41,15 @@ public: void PushOffset(double dx, double dy); void PushClipRect(double left, double right, double top, double bottom, int32_t clipBehavior); void PushClipRRect(const SkRRect& skRRect, int32_t clipBehavior); + void PushClipPath(const SkPath& skPath, int32_t clipBehavior); void PushOpacity(int32_t alpha, double dx = 0, double dy = 0); void PushBackdropFilter(sk_sp filter); void PushShaderMask(sk_sp shader, double maskRectLeft, double maskRectRight, double maskRectTop, double maskRectBottom, int32_t blendMode); + void PushGradientColorMask(const SkPaint& maskPaint); + void PushSvgMask(const sk_sp& svgDom, double x, double y, double scaleX, double scaleY); + void PushPathMask(const SkPaint& maskPaint, const SkPath& maskPath); + void PushFilter(const SkPaint& filterPaint); void Pop(); std::unique_ptr GetLayerTree() const; diff --git a/engine/flutter/flow/ohos_layers/mask_layer.cpp b/engine/flutter/flow/ohos_layers/mask_layer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..60ee26257c111b515ae5428f003aad647735cfd7 --- /dev/null +++ b/engine/flutter/flow/ohos_layers/mask_layer.cpp @@ -0,0 +1,61 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "flutter/flow/ohos_layers/mask_layer.h" + +#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/skia/include/core/SkMaskFilter.h" +#include "third_party/skia/include/effects/SkLumaColorFilter.h" + +#include "flutter/flow/ohos_layers/paint_context.h" + +namespace flutter::OHOS { + +void MaskLayer::Paint(const PaintContext& paintContext) const +{ + if (isSvgMask_ && !svgDom_) { + return; + } + + SkAutoCanvasRestore save(paintContext.skCanvas, true); + SkRect maskBounds = GetPaintBounds(); + auto& skCanvas_ = paintContext.skCanvas; + skCanvas_->saveLayer(maskBounds, nullptr); + int tmpLayer = skCanvas_->getSaveCount(); + + SkPaint mask_filter; +#ifdef USE_SYSTEM_SKIA + auto filter = SkColorFilter::MakeComposeFilter(SkLumaColorFilter::Make(), + SkColorFilter::MakeSRGBToLinearGamma()); +#else + auto filter = SkColorFilters::Compose(SkLumaColorFilter::Make(), + SkColorFilters::SRGBToLinearGamma()); +#endif + mask_filter.setColorFilter(filter); + skCanvas_->saveLayer(maskBounds, &mask_filter); + if (isSvgMask_) { + SkAutoCanvasRestore maskSave(paintContext.skCanvas, true); + skCanvas_->translate(maskBounds.fLeft + svgX_, maskBounds.fTop + svgY_); + skCanvas_->scale(scaleX_, scaleY_); + svgDom_->render(skCanvas_); + } else if (isGradientMask_) { + skCanvas_->drawRect(maskBounds, maskPaint_); + } else if (isPathMask_) { + SkAutoCanvasRestore maskSave(paintContext.skCanvas, true); + skCanvas_->translate(maskBounds.fLeft, maskBounds.fTop); + skCanvas_->drawPath(maskPath_, maskPaint_); + } + + // back to mask layer + skCanvas_->restoreToCount(tmpLayer); + // create content layer + SkPaint maskPaint; + maskPaint.setBlendMode(SkBlendMode::kSrcIn); + skCanvas_->saveLayer(maskBounds, &maskPaint); + skCanvas_->clipRect(maskBounds, true); + PaintChildren(paintContext); +} + +} // namespace flutter::OHOS \ No newline at end of file diff --git a/engine/flutter/flow/ohos_layers/mask_layer.h b/engine/flutter/flow/ohos_layers/mask_layer.h new file mode 100644 index 0000000000000000000000000000000000000000..b83da5c7105f452468f5a4c9aad92c18ad745320 --- /dev/null +++ b/engine/flutter/flow/ohos_layers/mask_layer.h @@ -0,0 +1,51 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef FLUTTER_FLOW_OHOS_LAYERS_MASK_LAYER_H +#define FLUTTER_FLOW_OHOS_LAYERS_MASK_LAYER_H + +#include "experimental/svg/model/SkSVGDOM.h" +#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkPath.h" +#include "third_party/skia/include/core/SkStream.h" + +#include "flutter/flow/ohos_layers/container_layer.h" +#include "flutter/flow/ohos_layers/layer.h" + +namespace flutter::OHOS { + +class MaskLayer : public ContainerLayer { +public: + MaskLayer(const SkPaint& maskPaint) + : isGradientMask_(true), maskPaint_(maskPaint) {} + + MaskLayer(double x, double y, double scaleX, double scaleY, const sk_sp& svgDom) + : isSvgMask_(true), svgX_(x), svgY_(y), scaleX_(scaleX), scaleY_(scaleY), svgDom_(svgDom) {} + + MaskLayer(const SkPaint& maskPaint, const SkPath& maskPath) + : isPathMask_(true), maskPaint_(maskPaint), maskPath_(maskPath) {} + + ~MaskLayer() override = default; + + void Paint(const PaintContext& paintContext) const override; + +private: + bool isSvgMask_ = false; + bool isGradientMask_ = false; + bool isPathMask_ = false; + double svgX_ = 0.0f; + double svgY_ = 0.0f; + double scaleX_ = 1.0f; + double scaleY_ = 1.0f; + sk_sp svgDom_; + SkPaint maskPaint_; + SkPath maskPath_; + + FML_DISALLOW_COPY_AND_ASSIGN(MaskLayer); +}; + +} // namespace flutter::OHOS + +#endif // FLUTTER_FLOW_OHOS_LAYERS_MASK_LAYER_H \ No newline at end of file diff --git a/engine/flutter/flow/ohos_layers/texture_register.cpp b/engine/flutter/flow/ohos_layers/texture_register.cpp index 4190f7701c0205b1d0e936ed89e9a3b92d0f0207..2e9990767297c365dde342bcc06cc6852b76705a 100644 --- a/engine/flutter/flow/ohos_layers/texture_register.cpp +++ b/engine/flutter/flow/ohos_layers/texture_register.cpp @@ -40,7 +40,7 @@ void SetTextureLayerAlpha(JNIEnv* env, jobject obj, jint alpha) bool AceTextureLayer::Register(JNIEnv* env) { g_layerTextureClass = new fml::jni::ScopedJavaGlobalRef( - env, env->FindClass("ohos/ace/adapter/texture/AceLayerTexture")); + env, env->FindClass("ohos/ace/capability/texture/AceLayerTexture")); if (g_layerTextureClass->is_null()) { FML_LOG(ERROR) << "Could not locate AceLayerTexture class"; return false; @@ -68,7 +68,24 @@ void AceTextureLayer::setAlpha(int32_t alpha) void TextureRegistry::RegisterTexture(int64_t id, long textureHandle, const fml::jni::JavaObjectWeakGlobalRef& layerTexture) { - mapping_[id] = { id, textureHandle, layerTexture }; + if (mapping_.find(id) == mapping_.end()) { + mapping_[id] = { id, textureHandle, layerTexture }; + } else { + mapping_[id].id_ = id; + mapping_[id].handle_ = textureHandle; + mapping_[id].layerTexture_ = layerTexture; + } +} + +void TextureRegistry::RegisterNativeWindow(int64_t id, const void* nativeWindow) +{ + if (mapping_.find(id) == mapping_.end()) { + mapping_[id] = { + .nativeWindow_ = const_cast(nativeWindow) + }; + } else { + mapping_[id].nativeWindow_ = const_cast(nativeWindow); + } } void TextureRegistry::UnregisterTexture(int64_t id) diff --git a/engine/flutter/flow/ohos_layers/texture_register.h b/engine/flutter/flow/ohos_layers/texture_register.h index 2b975cceabf00f86abda8083c78fc25614d3cb38..914945c98fadc02590e7b040260da860b0c02048 100644 --- a/engine/flutter/flow/ohos_layers/texture_register.h +++ b/engine/flutter/flow/ohos_layers/texture_register.h @@ -23,6 +23,7 @@ struct AceTextureLayer { int64_t id_ = -1; long handle_ = 0; fml::jni::JavaObjectWeakGlobalRef layerTexture_; + void* nativeWindow_ = nullptr; int32_t alpha_ = 255; }; @@ -34,6 +35,9 @@ public: // Called from Platform thread. void RegisterTexture(int64_t id, long textureHandle, const fml::jni::JavaObjectWeakGlobalRef& layerTexture); + // Called from Platform thread. + void RegisterNativeWindow(int64_t id, const void* nativeWindow); + // Called from Platform thread. void UnregisterTexture(int64_t id); diff --git a/engine/flutter/fml/BUILD.gn b/engine/flutter/fml/BUILD.gn index 85b18692a243b880b6ed32d33a7d83b87777a724..0b985c0b7e7a261a421b713d779970a6444f3422 100644 --- a/engine/flutter/fml/BUILD.gn +++ b/engine/flutter/fml/BUILD.gn @@ -232,9 +232,7 @@ executable("fml_unittests") { executable("fml_benchmarks") { testonly = true - sources = [ - "message_loop_task_queues_benchmark.cc", - ] + sources = [ "message_loop_task_queues_benchmark.cc" ] deps = [ "$flutter_root/benchmarking", diff --git a/engine/flutter/frontend_server/BUILD.gn b/engine/flutter/frontend_server/BUILD.gn index 7d3dfd5f6892ce347ad938543eed214481e48f3e..0e7b363173c2e8b5f5fa24f58a5ce842ad8045c5 100644 --- a/engine/flutter/frontend_server/BUILD.gn +++ b/engine/flutter/frontend_server/BUILD.gn @@ -10,9 +10,7 @@ if (is_fuchsia_host || is_fuchsia) { disable_analysis = true package_name = "frontend_server" - sources = [ - "server.dart", - ] + sources = [ "server.dart" ] deps = [ "//third_party/dart-pkg/pub/args", @@ -33,18 +31,14 @@ if (is_fuchsia_host || is_fuchsia) { sources = [] - deps = [ - ":frontend_server", - ] + deps = [ ":frontend_server" ] } } else { import("//third_party/dart/utils/application_snapshot.gni") application_snapshot("frontend_server") { main_dart = "bin/starter.dart" - deps = [ - "$flutter_root/lib/snapshot:kernel_platform_files", - ] + deps = [ "$flutter_root/lib/snapshot:kernel_platform_files" ] dot_packages = rebase_path(".packages") flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk") training_args = [ diff --git a/engine/flutter/lib/snapshot/BUILD.gn b/engine/flutter/lib/snapshot/BUILD.gn index 996878320854306d7e369f1ab2c86780b883ce9e..b28a9f212754a24646349366c0f761a550c09e75 100644 --- a/engine/flutter/lib/snapshot/BUILD.gn +++ b/engine/flutter/lib/snapshot/BUILD.gn @@ -14,9 +14,7 @@ copy("generate_dart_ui") { visibility = [ ":*" ] sources = dart_ui_files - outputs = [ - "$bindings_output_dir/dart_ui/{{source_file_part}}", - ] + outputs = [ "$bindings_output_dir/dart_ui/{{source_file_part}}" ] } compiled_action("generate_snapshot_bin") { @@ -29,12 +27,8 @@ compiled_action("generate_snapshot_bin") { platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill" } - inputs = [ - platform_kernel, - ] - deps = [ - ":kernel_platform_files", - ] + inputs = [ platform_kernel ] + deps = [ ":kernel_platform_files" ] vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot.bin" vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin" @@ -104,9 +98,7 @@ template("bin_to_assembly") { script, invoker.input, ] - outputs = [ - output, - ] + outputs = [ output ] } } @@ -145,12 +137,8 @@ template("bin_to_coff") { if (current_cpu == "x64") { args += [ "--64-bit" ] } - inputs = [ - invoker.input, - ] - outputs = [ - output, - ] + inputs = [ invoker.input ] + outputs = [ output ] } } @@ -169,45 +157,35 @@ template("bin_to_linkable") { } bin_to_linkable("vm_snapshot_data_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/vm_isolate_snapshot.bin" symbol = "kDartVmSnapshotData" executable = false } bin_to_linkable("vm_snapshot_instructions_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/vm_snapshot_instructions.bin" symbol = "kDartVmSnapshotInstructions" executable = true } bin_to_linkable("isolate_snapshot_data_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/isolate_snapshot.bin" symbol = "kDartIsolateSnapshotData" executable = false } bin_to_linkable("isolate_snapshot_instructions_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/isolate_snapshot_instructions.bin" symbol = "kDartIsolateSnapshotInstructions" executable = true } bin_to_linkable("platform_strong_dill_linkable") { - deps = [ - ":kernel_platform_files", - ] + deps = [ ":kernel_platform_files" ] if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) { input = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill" } else { @@ -275,14 +253,11 @@ compile_platform("strong_platform") { # Fuchsia's snapshot requires a different platform with extra dart: libraries. if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) { group("kernel_platform_files") { - public_deps = [ - "//topaz/runtime/flutter_runner/kernel:kernel_platform_files", - ] + public_deps = + [ "//topaz/runtime/flutter_runner/kernel:kernel_platform_files" ] } } else { group("kernel_platform_files") { - public_deps = [ - ":strong_platform", - ] + public_deps = [ ":strong_platform" ] } } diff --git a/engine/flutter/lib/ui/BUILD.gn b/engine/flutter/lib/ui/BUILD.gn index a11ed9116e8b921541983ae6c4f1e9a87fa4671a..98f2f87fdc1632b50638e0cf4fd5fe5a71329b82 100644 --- a/engine/flutter/lib/ui/BUILD.gn +++ b/engine/flutter/lib/ui/BUILD.gn @@ -118,9 +118,7 @@ source_set("ui") { "//third_party/tonic", ] - public_deps = [ - "$flutter_root/third_party/txt", - ] + public_deps = [ "$flutter_root/third_party/txt" ] if (flutter_enable_skshaper) { defines = [ "FLUTTER_ENABLE_SKSHAPER" ] @@ -156,9 +154,7 @@ if (current_toolchain == host_toolchain) { executable("ui_unittests") { testonly = true - sources = [ - "painting/image_decoder_unittests.cc", - ] + sources = [ "painting/image_decoder_unittests.cc" ] deps = [ ":ui", diff --git a/engine/flutter/lib/ui/compositing/scene_builder.cc b/engine/flutter/lib/ui/compositing/scene_builder.cc index 49faaf6c6aa3d99a01d87dfa64c6f584af81bee4..66f67c73fca94005e9124dffdeddbaf64aacb55e 100644 --- a/engine/flutter/lib/ui/compositing/scene_builder.cc +++ b/engine/flutter/lib/ui/compositing/scene_builder.cc @@ -10,8 +10,10 @@ #include "flutter/flow/layers/clip_rrect_layer.h" #include "flutter/flow/layers/color_filter_layer.h" #include "flutter/flow/layers/container_layer.h" +#include "flutter/flow/layers/filter_layer.h" #include "flutter/flow/layers/layer.h" #include "flutter/flow/layers/layer_tree.h" +#include "flutter/flow/layers/mask_layer.h" #include "flutter/flow/layers/opacity_layer.h" #include "flutter/flow/layers/performance_overlay_layer.h" #include "flutter/flow/layers/physical_shape_layer.h" @@ -172,6 +174,40 @@ fml::RefPtr SceneBuilder::pushPhysicalShape(const CanvasPath* path, return EngineLayer::MakeRetained(layer); } +fml::RefPtr SceneBuilder::PushGradientColorMask(const SkPaint& maskPaint) +{ + auto layer = + std::make_shared(maskPaint); + PushLayer(layer); + return EngineLayer::MakeRetained(layer); +} + +fml::RefPtr SceneBuilder::PushSvgMask(const sk_sp& svgDom, + double x, + double y, + double scaleX, + double scaleY) +{ + auto layer = + std::make_shared(x, y, scaleX, scaleY, svgDom); + PushLayer(layer); + return EngineLayer::MakeRetained(layer); +} + +fml::RefPtr SceneBuilder::PushPathMask(const SkPaint& maskPaint, const SkPath& maskPath) { + auto layer = + std::make_shared(maskPaint, maskPath); + PushLayer(layer); + return EngineLayer::MakeRetained(layer); +} + +fml::RefPtr SceneBuilder::PushFilter(const SkPaint& filterPaint) { + auto layer = + std::make_shared(filterPaint); + PushLayer(layer); + return EngineLayer::MakeRetained(layer); +} + void SceneBuilder::addRetained(fml::RefPtr retainedLayer) { if (!current_layer_) { return; diff --git a/engine/flutter/lib/ui/compositing/scene_builder.h b/engine/flutter/lib/ui/compositing/scene_builder.h index 5e2bf7b9594ce3b00ef4bcb7186f4f674460693f..8c13c039e6ed5f96d9e8c83585b8f67a82f8c927 100644 --- a/engine/flutter/lib/ui/compositing/scene_builder.h +++ b/engine/flutter/lib/ui/compositing/scene_builder.h @@ -25,6 +25,10 @@ #include "flutter/lib/ui/compositing/scene_host.h" #endif +#include "experimental/svg/model/SkSVGDOM.h" +#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkPath.h" + namespace flutter { class SceneBuilder : public RefCountedDartWrappable { @@ -62,6 +66,10 @@ class SceneBuilder : public RefCountedDartWrappable { int color, int shadowColor, int clipBehavior); + fml::RefPtr PushGradientColorMask(const SkPaint& maskPaint); + fml::RefPtr PushSvgMask(const sk_sp& svgDom, double x, double y, double scaleX, double scaleY); + fml::RefPtr PushPathMask(const SkPaint& maskPaint, const SkPath& maskPath); + fml::RefPtr PushFilter(const SkPaint& filterPaint); void addRetained(fml::RefPtr retainedLayer); diff --git a/engine/flutter/runtime/BUILD.gn b/engine/flutter/runtime/BUILD.gn index 87147abde0071e8da580cc0b73501080d06fb8ee..8c12f2f533dd94cba9858a748f0f9ad9ba02c930 100644 --- a/engine/flutter/runtime/BUILD.gn +++ b/engine/flutter/runtime/BUILD.gn @@ -11,9 +11,7 @@ source_set("test_font") { "test_font_data.cc", "test_font_data.h", ] - deps = [ - "//third_party/skia", - ] + deps = [ "//third_party/skia" ] public_configs = [ "$flutter_root:config" ] defines = [] if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) { @@ -87,9 +85,7 @@ source_set("runtime") { "//third_party/tonic", ] - public_deps = [ - "//third_party/rapidjson", - ] + public_deps = [ "//third_party/rapidjson" ] public_configs = [ "$flutter_root:config" ] @@ -142,7 +138,5 @@ executable("runtime_unittests") { "dart_vm_unittests.cc", ] - deps = [ - ":runtime_unittests_common", - ] + deps = [ ":runtime_unittests_common" ] } diff --git a/engine/flutter/shell/BUILD.gn b/engine/flutter/shell/BUILD.gn index e4bfd9e8fda5da104db95b559dcfd6894c85075e..0536023fbd0c1b79bc034edb24fe59f111ee852c 100644 --- a/engine/flutter/shell/BUILD.gn +++ b/engine/flutter/shell/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("shell") { - deps = [ - "platform", - ] + deps = [ "platform" ] } diff --git a/engine/flutter/shell/common/BUILD.gn b/engine/flutter/shell/common/BUILD.gn index bd4f7cae5ec52449582f523051ad293a37a0cbba..691803b297ba616cbede16b849a451450c9a8fd2 100644 --- a/engine/flutter/shell/common/BUILD.gn +++ b/engine/flutter/shell/common/BUILD.gn @@ -28,9 +28,7 @@ template("dart_embedder_resources") { } output = invoker.output - outputs = [ - output, - ] + outputs = [ output ] inputs = [ script ] + invoker.inputs @@ -172,9 +170,7 @@ if (current_toolchain == host_toolchain) { } shell_host_executable("shell_benchmarks") { - sources = [ - "shell_benchmarks.cc", - ] + sources = [ "shell_benchmarks.cc" ] deps = [ ":shell_unittests_fixtures", diff --git a/engine/flutter/shell/gpu/gpu_surface_gl.cc b/engine/flutter/shell/gpu/gpu_surface_gl.cc index 7291026b53e075d1d56baf300b0378698b8477fc..2c329c8db842daf59b75f7163b7bbe74c80b0d4a 100644 --- a/engine/flutter/shell/gpu/gpu_surface_gl.cc +++ b/engine/flutter/shell/gpu/gpu_surface_gl.cc @@ -301,7 +301,7 @@ bool GPUSurfaceGL::PresentSurface(SkCanvas* canvas) { SkPixmap data(info, pixelBuffer.get(), width * pixelSize); if (onscreen_surface_->readPixels(data, 0, 0)) { - delegate_->GLContextSendSurface(data.addr(), data.rowBytes() * data.height()); + delegate_->GLContextSendSurface(data.addr(), data.rowBytes() * data.height(), width, height); } else { FML_LOG(ERROR) << "GLContextSendSurface failed"; } diff --git a/engine/flutter/shell/platform/BUILD.gn b/engine/flutter/shell/platform/BUILD.gn index 4b881909d14e265e7261a2669707e439a30c9333..a22df2923228cf7c82ff53e0a006666691dd3c3e 100644 --- a/engine/flutter/shell/platform/BUILD.gn +++ b/engine/flutter/shell/platform/BUILD.gn @@ -6,31 +6,21 @@ import("//build/fuchsia/sdk.gni") group("platform") { if (is_mac || is_ios) { - deps = [ - "darwin", - ] + deps = [ "darwin" ] } else if (is_android) { - deps = [ - "android", - ] + deps = [ "android" ] } else if (is_linux) { if (is_fuchsia_host) { # The linux build is not supported as part of the Fuchsia host build. deps = [] } else { - deps = [ - "linux", - ] + deps = [ "linux" ] } } else if (is_win) { - deps = [ - "windows", - ] + deps = [ "windows" ] } else if (is_fuchsia) { if (using_fuchsia_sdk) { - deps = [ - "fuchsia", - ] + deps = [ "fuchsia" ] } } else { assert(false, "Unknown/Unsupported platform.") diff --git a/engine/flutter/shell/platform/android/BUILD.gn b/engine/flutter/shell/platform/android/BUILD.gn index 6a286f356751f9593a15a4cebab5e6876d919f14..d95b6f36a15eed390af2fca5e14f314fcf7a8e78 100644 --- a/engine/flutter/shell/platform/android/BUILD.gn +++ b/engine/flutter/shell/platform/android/BUILD.gn @@ -96,9 +96,7 @@ action("gen_android_build_config_java") { build_config_java = "$target_gen_dir/io/flutter/BuildConfig.java" - outputs = [ - build_config_java, - ] + outputs = [ build_config_java ] args = [ "--out", @@ -249,9 +247,7 @@ action("flutter_shell_java") { source_jar_path, source_jar_path + ".md5.stamp", ] - inputs = [ - android_sdk_jar, - ] + inputs = [ android_sdk_jar ] inputs += android_support_jars _rebased_current_path = rebase_path(".") @@ -273,9 +269,7 @@ action("flutter_shell_java") { args += rebase_path(sources, root_build_dir) - deps = [ - ":gen_android_build_config_java", - ] + deps = [ ":gen_android_build_config_java" ] } action("icudtl_object") { @@ -284,13 +278,9 @@ action("icudtl_object") { icudtl_input = "//third_party/icu/flutter/icudtl.dat" icudtl_output = "$root_build_dir/flutter_icu/icudtl.o" - inputs = [ - "$icudtl_input", - ] + inputs = [ "$icudtl_input" ] - outputs = [ - "$icudtl_output", - ] + outputs = [ "$icudtl_output" ] args = [ "--objcopy", @@ -346,16 +336,12 @@ action("android") { action("pom_libflutter") { script = "$flutter_root/tools/android_support/generate_pom_file.py" - inputs = [ - "$flutter_root/tools/android_support/files.json", - ] + inputs = [ "$flutter_root/tools/android_support/files.json" ] artifact_id = string_replace(android_app_abi, "-", "_") + "_" + flutter_runtime_mode - outputs = [ - "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom", - ] + outputs = [ "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom" ] args = [ "--destination", @@ -370,15 +356,11 @@ action("pom_libflutter") { action("pom_embedding") { script = "$flutter_root/tools/android_support/generate_pom_file.py" - inputs = [ - "$flutter_root/tools/android_support/files.json", - ] + inputs = [ "$flutter_root/tools/android_support/files.json" ] artifact_id = "flutter_embedding_$flutter_runtime_mode" - outputs = [ - "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom", - ] + outputs = [ "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom" ] args = [ "--destination", diff --git a/engine/flutter/shell/platform/common/cpp/BUILD.gn b/engine/flutter/shell/platform/common/cpp/BUILD.gn index ac678700d86b6cdd1425830a77d034a7300b15d3..f66e4b85cb4600054ee27e3eae96ddff54bb40d2 100644 --- a/engine/flutter/shell/platform/common/cpp/BUILD.gn +++ b/engine/flutter/shell/platform/common/cpp/BUILD.gn @@ -57,7 +57,5 @@ source_set("common_cpp") { copy("publish_headers") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } diff --git a/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn b/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn index 5858f868991397777a04f38a5a1daeb2ff9edfeb..58587f77bb0e9d9fdcde5e07193324623f7deedb 100644 --- a/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn +++ b/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn @@ -34,9 +34,8 @@ source_set("client_wrapper_library_stubs") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers" ] } test_fixtures("client_wrapper_fixtures") { diff --git a/engine/flutter/shell/platform/common/cpp/client_wrapper/publish.gni b/engine/flutter/shell/platform/common/cpp/client_wrapper/publish.gni index bc16551564f8a579e1cfe02e4fbd1daf581d9735..e52bf6a319369d07862ab418da6e9dd2b9e30a5c 100644 --- a/engine/flutter/shell/platform/common/cpp/client_wrapper/publish.gni +++ b/engine/flutter/shell/platform/common/cpp/client_wrapper/publish.gni @@ -44,25 +44,19 @@ template("publish_client_wrapper") { ] sources = invoker.public - outputs = [ - "$publish_dir_root/include/$namespace/{{source_file_part}}", - ] + outputs = [ "$publish_dir_root/include/$namespace/{{source_file_part}}" ] } copy("${template_target_name}_publish_sources") { visibility = [ ":$template_target_name" ] sources = invoker.sources - outputs = [ - "$publish_dir_root/{{source_file_part}}", - ] + outputs = [ "$publish_dir_root/{{source_file_part}}" ] # GN on Windows appears to do #include checks even for copy # targets, so add the dependency to the headers to satisfy # the check. - deps = [ - ":${template_target_name}_publish_includes", - ] + deps = [ ":${template_target_name}_publish_includes" ] } } @@ -103,8 +97,6 @@ template("publish_client_wrapper_extension") { "sources", "directory_suffix", ]) - public_deps = [ - ":$core_target_name", - ] + public_deps = [ ":$core_target_name" ] } } diff --git a/engine/flutter/shell/platform/darwin/BUILD.gn b/engine/flutter/shell/platform/darwin/BUILD.gn index efae1a9f1975cdf95ae768cd08d7ab6c26f13e23..a2d2146c6272fb4ab83533ac75b362cdc9a4ea90 100644 --- a/engine/flutter/shell/platform/darwin/BUILD.gn +++ b/engine/flutter/shell/platform/darwin/BUILD.gn @@ -8,14 +8,10 @@ import("$flutter_root/testing/testing.gni") group("darwin") { if (is_ios) { - deps = [ - "ios:flutter_framework", - ] + deps = [ "ios:flutter_framework" ] } if (is_mac) { - deps = [ - "macos", - ] + deps = [ "macos" ] } } diff --git a/engine/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/flutter/shell/platform/darwin/ios/BUILD.gn index 3843b50960e6dd5fd64e07b71d4ba1f764fb334f..81cd63bf12dee63ef92fcc7451989ab9473a6863 100644 --- a/engine/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/flutter/shell/platform/darwin/ios/BUILD.gn @@ -139,16 +139,10 @@ shared_library("create_flutter_framework_dylib") { copy("copy_framework_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/libFlutter.dylib", - ] - outputs = [ - "$_flutter_framework_dir/Flutter", - ] + sources = [ "$root_out_dir/libFlutter.dylib" ] + outputs = [ "$_flutter_framework_dir/Flutter" ] - deps = [ - ":create_flutter_framework_dylib", - ] + deps = [ ":create_flutter_framework_dylib" ] } action("copy_dylib_and_update_framework_install_name") { @@ -156,12 +150,8 @@ action("copy_dylib_and_update_framework_install_name") { stamp_file = "$root_out_dir/flutter_install_name_stamp" script = "$flutter_root/sky/tools/change_install_name.py" - inputs = [ - "$_flutter_framework_dir/Flutter", - ] - outputs = [ - stamp_file, - ] + inputs = [ "$_flutter_framework_dir/Flutter" ] + outputs = [ stamp_file ] args = [ "--dylib", @@ -172,20 +162,14 @@ action("copy_dylib_and_update_framework_install_name") { rebase_path(stamp_file), ] - deps = [ - ":copy_framework_dylib", - ] + deps = [ ":copy_framework_dylib" ] } action("copy_framework_info_plist") { script = "$flutter_root/build/copy_info_plist.py" visibility = [ ":*" ] - sources = [ - "framework/Info.plist", - ] - outputs = [ - "$_flutter_framework_dir/Info.plist", - ] + sources = [ "framework/Info.plist" ] + outputs = [ "$_flutter_framework_dir/Info.plist" ] args = [ rebase_path(sources[0]), rebase_path(outputs[0]), @@ -195,12 +179,8 @@ action("copy_framework_info_plist") { copy("copy_framework_module_map") { visibility = [ ":*" ] - sources = [ - "framework/module.modulemap", - ] - outputs = [ - "$_flutter_framework_dir/Modules/module.modulemap", - ] + sources = [ "framework/module.modulemap" ] + outputs = [ "$_flutter_framework_dir/Modules/module.modulemap" ] } action("copy_framework_headers") { @@ -222,44 +202,28 @@ action("copy_framework_headers") { copy("copy_framework_icu") { visibility = [ ":*" ] - sources = [ - "//third_party/icu/flutter/icudtl.dat", - ] - outputs = [ - "$_flutter_framework_dir/{{source_file_part}}", - ] + sources = [ "//third_party/icu/flutter/icudtl.dat" ] + outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ] } copy("copy_framework_podspec") { visibility = [ ":*" ] - sources = [ - "framework/Flutter.podspec", - ] - outputs = [ - "$root_out_dir/Flutter.podspec", - ] + sources = [ "framework/Flutter.podspec" ] + outputs = [ "$root_out_dir/Flutter.podspec" ] } copy("copy_license") { visibility = [ ":*" ] - sources = [ - "//LICENSE", - ] - outputs = [ - "$root_out_dir/LICENSE", - ] + sources = [ "//LICENSE" ] + outputs = [ "$root_out_dir/LICENSE" ] } shared_library("copy_and_verify_framework_headers") { visibility = [ ":*" ] include_dirs = [ "$_flutter_framework_headers_copy_dir" ] - sources = [ - "framework/Source/FlutterUmbrellaImport.m", - ] - deps = [ - ":copy_framework_headers", - ] + sources = [ "framework/Source/FlutterUmbrellaImport.m" ] + deps = [ ":copy_framework_headers" ] } group("flutter_framework") { diff --git a/engine/flutter/shell/platform/darwin/macos/BUILD.gn b/engine/flutter/shell/platform/darwin/macos/BUILD.gn index 20d0961275ff6298d46488d8f48bf04663ccb787..143f590b6fffd5c324b26dd3c53ae7927c0d69b7 100644 --- a/engine/flutter/shell/platform/darwin/macos/BUILD.gn +++ b/engine/flutter/shell/platform/darwin/macos/BUILD.gn @@ -10,9 +10,7 @@ import("$flutter_root/shell/platform/darwin/common/framework_shared.gni") import("$flutter_root/shell/platform/glfw/config.gni") group("macos") { - deps = [ - ":flutter_framework", - ] + deps = [ ":flutter_framework" ] if (build_glfw_shell) { deps += [ ":flutter_macos_glfw", @@ -79,16 +77,10 @@ shared_library("create_flutter_framework_dylib") { copy("copy_framework_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/lib$_flutter_framework_name.dylib", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/$_flutter_framework_name", - ] + sources = [ "$root_out_dir/lib$_flutter_framework_name.dylib" ] + outputs = [ "$_flutter_framework_dir/Versions/A/$_flutter_framework_name" ] - deps = [ - ":create_flutter_framework_dylib", - ] + deps = [ ":create_flutter_framework_dylib" ] } action("copy_dylib_and_update_framework_install_name") { @@ -96,12 +88,8 @@ action("copy_dylib_and_update_framework_install_name") { stamp_file = "$root_out_dir/flutter_install_name_stamp" script = "$flutter_root/sky/tools/change_install_name.py" - inputs = [ - "$_flutter_framework_dir/Versions/A/$_flutter_framework_name", - ] - outputs = [ - stamp_file, - ] + inputs = [ "$_flutter_framework_dir/Versions/A/$_flutter_framework_name" ] + outputs = [ stamp_file ] args = [ "--dylib", @@ -112,29 +100,19 @@ action("copy_dylib_and_update_framework_install_name") { rebase_path(stamp_file), ] - deps = [ - ":copy_framework_dylib", - ] + deps = [ ":copy_framework_dylib" ] } copy("copy_framework_info_plist") { visibility = [ ":*" ] - sources = [ - "framework/Info.plist", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/Resources/Info.plist", - ] + sources = [ "framework/Info.plist" ] + outputs = [ "$_flutter_framework_dir/Versions/A/Resources/Info.plist" ] } copy("copy_framework_module_map") { visibility = [ ":*" ] - sources = [ - "framework/module.modulemap", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/Modules/module.modulemap", - ] + sources = [ "framework/module.modulemap" ] + outputs = [ "$_flutter_framework_dir/Versions/A/Modules/module.modulemap" ] } action("copy_framework_headers") { @@ -156,30 +134,21 @@ action("copy_framework_headers") { copy("copy_framework_icu") { visibility = [ ":*" ] - sources = [ - "//third_party/icu/flutter/icudtl.dat", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}", - ] + sources = [ "//third_party/icu/flutter/icudtl.dat" ] + outputs = + [ "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}" ] } copy("copy_license") { visibility = [ ":*" ] - sources = [ - "//LICENSE", - ] - outputs = [ - "$root_out_dir/LICENSE", - ] + sources = [ "//LICENSE" ] + outputs = [ "$root_out_dir/LICENSE" ] } action("_generate_symlinks") { visibility = [ ":*" ] script = "//build/config/mac/package_framework.py" - outputs = [ - "$root_build_dir/$_flutter_framework_name.stamp", - ] + outputs = [ "$root_build_dir/$_flutter_framework_name.stamp" ] args = [ "--framework", "$_flutter_framework_filename", @@ -205,12 +174,8 @@ action("_generate_symlinks") { copy("copy_framework_podspec") { visibility = [ ":*" ] - sources = [ - "framework/FlutterMacOS.podspec", - ] - outputs = [ - "$root_out_dir/FlutterMacOS.podspec", - ] + sources = [ "framework/FlutterMacOS.podspec" ] + outputs = [ "$root_out_dir/FlutterMacOS.podspec" ] } group("flutter_framework") { @@ -222,9 +187,7 @@ group("flutter_framework") { if (build_glfw_shell) { shared_library("flutter_macos_glfw") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] public_configs = [ "$flutter_root:config" ] } diff --git a/engine/flutter/shell/platform/embedder/BUILD.gn b/engine/flutter/shell/platform/embedder/BUILD.gn index 1efe84661bd9569eb82dbdb968544b04cff94f5c..fd3db110e01f1c6decade167bb282d7170529cb8 100644 --- a/engine/flutter/shell/platform/embedder/BUILD.gn +++ b/engine/flutter/shell/platform/embedder/BUILD.gn @@ -125,21 +125,15 @@ shared_library("flutter_engine_library") { output_name = "flutter_engine" - deps = [ - ":embedder", - ] + deps = [ ":embedder" ] public_configs = [ "$flutter_root:config" ] } copy("copy_headers") { visibility = [ ":*" ] - sources = [ - "embedder.h", - ] - outputs = [ - "$root_out_dir/flutter_embedder.h", - ] + sources = [ "embedder.h" ] + outputs = [ "$root_out_dir/flutter_embedder.h" ] } if (is_mac && !embedder_for_target) { @@ -147,22 +141,14 @@ if (is_mac && !embedder_for_target) { copy("copy_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/libflutter_engine.dylib", - ] - outputs = [ - "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder", - ] - deps = [ - ":flutter_engine_library", - ] + sources = [ "$root_out_dir/libflutter_engine.dylib" ] + outputs = [ "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder" ] + deps = [ ":flutter_engine_library" ] } copy("copy_framework_headers") { visibility = [ ":*" ] - sources = [ - "embedder.h", - ] + sources = [ "embedder.h" ] outputs = [ "$_flutter_embedder_framework_dir/Versions/A/Headers/FlutterEmbedder.h", ] @@ -170,23 +156,17 @@ if (is_mac && !embedder_for_target) { copy("copy_icu") { visibility = [ ":*" ] - sources = [ - "//third_party/icu/flutter/icudtl.dat", - ] - outputs = [ - "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat", - ] + sources = [ "//third_party/icu/flutter/icudtl.dat" ] + outputs = + [ "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat" ] } action("copy_info_plist") { script = "$flutter_root/build/copy_info_plist.py" visibility = [ ":*" ] - sources = [ - "assets/EmbedderInfo.plist", - ] - outputs = [ - "$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist", - ] + sources = [ "assets/EmbedderInfo.plist" ] + outputs = + [ "$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist" ] args = [ rebase_path(sources[0]), rebase_path(outputs[0]), @@ -196,9 +176,7 @@ if (is_mac && !embedder_for_target) { copy("copy_module_map") { visibility = [ ":*" ] - sources = [ - "assets/embedder.modulemap", - ] + sources = [ "assets/embedder.modulemap" ] outputs = [ "$_flutter_embedder_framework_dir/Versions/A/Modules/module.modulemap", ] @@ -209,13 +187,9 @@ if (is_mac && !embedder_for_target) { stamp_file = "$root_build_dir/flutter_embedder_install_name_stamp" script = "$flutter_root/sky/tools/change_install_name.py" - inputs = [ - "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder", - ] + inputs = [ "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder" ] - outputs = [ - stamp_file, - ] + outputs = [ stamp_file ] args = [ "--dylib", @@ -226,17 +200,13 @@ if (is_mac && !embedder_for_target) { rebase_path(stamp_file), ] - deps = [ - ":copy_dylib", - ] + deps = [ ":copy_dylib" ] } action("generate_symlinks") { visibility = [ ":*" ] script = "//build/config/mac/package_framework.py" - outputs = [ - "$root_build_dir/FlutterEmbedder.stamp", - ] + outputs = [ "$root_build_dir/FlutterEmbedder.stamp" ] args = [ "--framework", "FlutterEmbedder.framework", @@ -261,9 +231,7 @@ if (is_mac && !embedder_for_target) { group("flutter_embedder_framework") { visibility = [ ":*" ] - deps = [ - ":generate_symlinks", - ] + deps = [ ":generate_symlinks" ] } } diff --git a/engine/flutter/shell/platform/embedder/ace_embedder.cc b/engine/flutter/shell/platform/embedder/ace_embedder.cc index 162d3dccdb2c01ca9b0a6efb1d6ad3a2433a20cf..19be62ba4a4181939e95d36ef3c10718984847da 100644 --- a/engine/flutter/shell/platform/embedder/ace_embedder.cc +++ b/engine/flutter/shell/platform/embedder/ace_embedder.cc @@ -153,8 +153,10 @@ InferOpenGLPlatformViewCreationCallback( }; auto gl_send_surface = [ptr = config->open_gl.send_current_surface, - user_data](const void* pixels, size_t size) -> bool { - return ptr(pixels, size); + user_data](const void* pixels, const size_t size, + const int32_t width, + const int32_t height) -> bool { + return ptr(pixels, size, width, height); }; auto gl_fbo_callback = [ptr = config->open_gl.fbo_callback, diff --git a/engine/flutter/shell/platform/embedder/embedder.h b/engine/flutter/shell/platform/embedder/embedder.h index c31884553b6897b23adcf0215ebc12c9fd040af0..cde957bb8db74f8ffede73bd5b02d07cfb6cc074 100644 --- a/engine/flutter/shell/platform/embedder/embedder.h +++ b/engine/flutter/shell/platform/embedder/embedder.h @@ -118,7 +118,7 @@ typedef struct { // ACE PC preivew using IdleCallback = std::function; -typedef bool (*UserBoolCallback)(const void*, size_t); +typedef bool (*UserBoolCallback)(const void*, const size_t, const int32_t, const int32_t); #ifdef USE_GLFW_WINDOW namespace flutter { class PointerDataPacket; diff --git a/engine/flutter/shell/platform/embedder/embedder_surface_gl.cc b/engine/flutter/shell/platform/embedder/embedder_surface_gl.cc index 821f0c4d5427367517af9d6911c3be28688f86e2..d214bf3a3cd664e0ae939f258525cd2e4903f6ec 100644 --- a/engine/flutter/shell/platform/embedder/embedder_surface_gl.cc +++ b/engine/flutter/shell/platform/embedder/embedder_surface_gl.cc @@ -49,8 +49,12 @@ bool EmbedderSurfaceGL::GLContextPresent() { } // |GPUSurfaceGLDelegate| -bool EmbedderSurfaceGL::GLContextSendSurface(const void* pixels, size_t size) { - return gl_dispatch_table_.gl_send_surface_callback(pixels, size); +bool EmbedderSurfaceGL::GLContextSendSurface(const void* pixels, + const size_t size, + const int32_t width, + const int32_t height) { + return gl_dispatch_table_.gl_send_surface_callback(pixels, size, width, + height); } // |GPUSurfaceGLDelegate| diff --git a/engine/flutter/shell/platform/embedder/embedder_surface_gl.h b/engine/flutter/shell/platform/embedder/embedder_surface_gl.h index 71e2cdc4bc03297ea7fa3a039679eeb680a69f0e..5f5b27ed53331f1f5c63fe4f8ae10f338f727b5f 100644 --- a/engine/flutter/shell/platform/embedder/embedder_surface_gl.h +++ b/engine/flutter/shell/platform/embedder/embedder_surface_gl.h @@ -19,7 +19,8 @@ class EmbedderSurfaceGL final : public EmbedderSurface, std::function gl_make_current_callback; // required std::function gl_clear_current_callback; // required std::function gl_present_callback; // required - std::function gl_send_surface_callback; // for PC preview, optional + // for PC preview, optional + std::function gl_send_surface_callback; std::function gl_fbo_callback; // required std::function gl_make_resource_current_callback; // optional std::function @@ -60,7 +61,7 @@ class EmbedderSurfaceGL final : public EmbedderSurface, bool GLContextPresent() override; // |GPUSurfaceGLDelegate| - bool GLContextSendSurface(const void* pixels, size_t size) override; + bool GLContextSendSurface(const void* pixels, size_t size, int32_t width, int32_t height) override; // |GPUSurfaceGLDelegate| intptr_t GLContextFBO() const override; diff --git a/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn index 96ee6bc04f076fb147af76a0c419675f915bc87b..ddf677ffde2d508b8b2711a438f68e67fbbd6848 100644 --- a/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn @@ -9,9 +9,7 @@ config("sdk_ext_config") { } group("fuchsia") { - public_deps = [ - ":sdk_ext", - ] + public_deps = [ ":sdk_ext" ] } source_set("sdk_ext") { diff --git a/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn index 3116502547e53852df5b68b6f8b070624eb1fa0c..d619283c640b69b7347adb392c5434fafdae38d1 100644 --- a/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn @@ -9,9 +9,7 @@ import("//third_party/dart/utils/compile_platform.gni") application_snapshot("kernel_compiler") { main_dart = "compiler.dart" - deps = [ - "../flutter/kernel:kernel_platform_files($host_toolchain)", - ] + deps = [ "../flutter/kernel:kernel_platform_files($host_toolchain)" ] dot_packages = rebase_path("//third_party/dart/.packages") diff --git a/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn index 53ad9b4bc86dc5207b9bde55f3de64265e253a86..bd052e29e7de8549cfa050ab74cd1f547c434079 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn @@ -50,12 +50,8 @@ template("create_aot_snapshot") { shim_kernel = get_label_info(shim_target, "target_gen_dir") + "/shim${product_suffix}_kernel.dil" - inputs = [ - shim_kernel, - ] - outputs = [ - snapshot_assembly, - ] + inputs = [ shim_kernel ] + outputs = [ snapshot_assembly ] deps = gen_snapshot_deps + [ shim_target ] if (invoker.product) { @@ -81,9 +77,7 @@ template("create_aot_snapshot") { } source_set(target_name) { - deps = [ - ":${target_name}_assembly", - ] + deps = [ ":${target_name}_assembly" ] sources = [ "$target_gen_dir/aot${product_suffix}_vm_snapshot.S", diff --git a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn index f8a76c2436c20b14302056081e2cef410fad81e1..8e856ad91271f4452081d77ef549588332af0601 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn @@ -6,9 +6,7 @@ import("//build/testing/environments.gni") import("//topaz/runtime/dart_runner/dart_app.gni") dart_jit_app("goodbye_dart_jit") { - sources = [ - "goodbye_dart.dart", - ] + sources = [ "goodbye_dart.dart" ] main_dart = "goodbye_dart.dart" source_dir = "." @@ -26,9 +24,7 @@ dart_jit_app("goodbye_dart_jit") { } dart_aot_app("goodbye_dart_aot") { - sources = [ - "goodbye_dart.dart", - ] + sources = [ "goodbye_dart.dart" ] main_dart = "goodbye_dart.dart" source_dir = "." @@ -46,12 +42,8 @@ dart_aot_app("goodbye_dart_aot") { } copy("copy_goodbye_dart_test") { - sources = [ - "goodbye_dart_test", - ] - outputs = [ - "${root_build_dir}/goodbye_dart_test", - ] + sources = [ "goodbye_dart_test" ] + outputs = [ "${root_build_dir}/goodbye_dart_test" ] } package("goodbye_dart_test") { @@ -62,7 +54,5 @@ package("goodbye_dart_test") { environments = basic_envs }, ] - deps = [ - ":copy_goodbye_dart_test", - ] + deps = [ ":copy_goodbye_dart_test" ] } diff --git a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn index 082624f0874455dac78c62cb63ef5bd885cd34dd..067f8d4a671126dcd947b05e24a4452d4f104c21 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn @@ -7,9 +7,7 @@ import("//build/dart/dart_library.gni") dart_library("greeting") { infer_package_name = true - sources = [ - "greeting.dart", - ] + sources = [ "greeting.dart" ] source_dir = "." } diff --git a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn index 19ac79665f66419fdccae8420103fb986b9fc417..49e3a43fd4a742d1021d0e7966df99eeed2fec84 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn @@ -7,7 +7,5 @@ import("//build/fidl/fidl.gni") fidl("interfaces") { name = "fuchsia.examples.hello" - sources = [ - "hello.fidl", - ] + sources = [ "hello.fidl" ] } diff --git a/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn index 1c2029500fcb243d3c01d438977a08748f5feeb1..c21bed2672804dd320d554f50a55a49a6809c891 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn @@ -36,9 +36,7 @@ template("create_kernel_core_snapshot") { } compiled_action(target_name) { - deps = [ - ":kernel_platform_files", - ] + deps = [ ":kernel_platform_files" ] platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill" compilation_trace = diff --git a/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn b/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn index 90ba1e87b5c300c4da8bee2016b5517fc656d8a1..8489bc80119f5018b6b6b91701fba6e8b45557a1 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn @@ -282,9 +282,7 @@ template("aot_runner") { } package_dir(target_name) { - deps = [ - ":aot${product_suffix}", - ] + deps = [ ":aot${product_suffix}" ] if (!product) { deps += [ observatory_target ] diff --git a/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn index 75d470f378ec6de31032d50d372c7a746ada5583..91d5bcd63382908e757e09b2fe6d9af77ccf7d95 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn @@ -39,9 +39,7 @@ template("core_snapshot") { } compiled_action(target_name) { - deps = [ - ":kernel_platform_files", - ] + deps = [ ":kernel_platform_files" ] platform_dill = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill" diff --git a/engine/flutter/shell/platform/glfw/BUILD.gn b/engine/flutter/shell/platform/glfw/BUILD.gn index 3a2d254f746e122275a648118905a1b1a463ef96..604108c3629a6c2ac14f21b0a89105729862524a 100644 --- a/engine/flutter/shell/platform/glfw/BUILD.gn +++ b/engine/flutter/shell/platform/glfw/BUILD.gn @@ -17,9 +17,8 @@ config("relative_flutter_glfw_headers") { source_set("flutter_glfw_headers") { public = _public_headers - public_deps = [ - "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "$flutter_root/shell/platform/common/cpp:desktop_library_implementation", @@ -77,12 +76,8 @@ source_set("flutter_glfw") { copy("publish_headers_glfw") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] # The GLFW header assumes the presence of the common headers. - deps = [ - "$flutter_root/shell/platform/common/cpp:publish_headers", - ] + deps = [ "$flutter_root/shell/platform/common/cpp:publish_headers" ] } diff --git a/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn b/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn index 6eb4d4ca9a6304ccfac4af3fdd2af613b7674218..0789403621cc2166fcdebe91417415af95030e9b 100644 --- a/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn +++ b/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn @@ -68,9 +68,7 @@ source_set("client_wrapper_library_stubs_glfw") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw_headers", - ] + public_deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw_headers" ] } test_fixtures("client_wrapper_glfw_fixtures") { @@ -81,9 +79,7 @@ executable("client_wrapper_glfw_unittests") { testonly = true # TODO: Add more unit tests. - sources = [ - "flutter_window_controller_unittests.cc", - ] + sources = [ "flutter_window_controller_unittests.cc" ] deps = [ ":client_wrapper_glfw", diff --git a/engine/flutter/shell/platform/glfw/flutter_glfw.cc b/engine/flutter/shell/platform/glfw/flutter_glfw.cc index de109dd60891d3362110eec5acd3cb19cdafeddd..b557e4690ab1918eb51efe17e3c93d7148b9d7d3 100644 --- a/engine/flutter/shell/platform/glfw/flutter_glfw.cc +++ b/engine/flutter/shell/platform/glfw/flutter_glfw.cc @@ -619,6 +619,30 @@ void FlutterDesktopWindowSetFrame(FlutterDesktopWindowRef flutter_window, height - frame_top - frame_bottom); } +void FlutterDesktopGetWindowSize(FlutterDesktopWindowRef flutter_window, + int* width, + int* height) { + glfwGetWindowSize(flutter_window->window, width, height); +} + +void FlutterDesktopSetWindowSize(FlutterDesktopWindowRef flutter_window, + int& width, + int& height) { + glfwSetWindowSize(flutter_window->window, width, height); +#ifdef USE_GLFW_WINDOW + int width_px, height_px; + glfwGetFramebufferSize(flutter_window->window, &width_px, &height_px); + width = width_px; + height = height_px; +#endif + GLFWFramebufferSizeCallback(flutter_window->window, width, height); + + // Set up GLFW callbacks for the window. + glfwSetFramebufferSizeCallback(flutter_window->window, GLFWFramebufferSizeCallback); + glfwSetWindowRefreshCallback(flutter_window->window, GLFWWindowRefreshCallback); + GLFWAssignEventCallbacks(flutter_window->window); +} + double FlutterDesktopWindowGetScaleFactor( FlutterDesktopWindowRef flutter_window) { return flutter_window->pixels_per_screen_coordinate; diff --git a/engine/flutter/shell/platform/glfw/public/flutter_glfw.h b/engine/flutter/shell/platform/glfw/public/flutter_glfw.h index af92cf3c06208143a40980d988c37df63a6d52f0..40379114532e0e49d142e52ff0b217b386160514 100644 --- a/engine/flutter/shell/platform/glfw/public/flutter_glfw.h +++ b/engine/flutter/shell/platform/glfw/public/flutter_glfw.h @@ -27,7 +27,7 @@ typedef struct FlutterDesktopEngineState* FlutterDesktopEngineRef; // For PC preivew using IdleCallback = std::function; -using SurfacePresentCallback = bool (*)(const void*, size_t); +using SurfacePresentCallback = bool (*)(const void*, const size_t, const int32_t, const int32_t); // Sets up the library's graphic context. Must be called before any other // methods. @@ -80,6 +80,16 @@ FLUTTER_EXPORT void FlutterDesktopGetFramebufferSize( int* width, int* height); +FLUTTER_EXPORT void FlutterDesktopGetWindowSize( + FlutterDesktopWindowRef flutter_window, + int* width, + int* height); + +FLUTTER_EXPORT void FlutterDesktopSetWindowSize( + FlutterDesktopWindowRef flutter_window, + int& width, + int& height); + // Loops on Flutter window events until the window is closed. // // Once this function returns, |controller| is no longer valid, and must not be diff --git a/engine/flutter/shell/platform/linux/BUILD.gn b/engine/flutter/shell/platform/linux/BUILD.gn index cc23d93d6d0ba1d04c6d557b7e5605a937ea6f31..ff609f60a58a3b5586658e8880d0936314973021 100644 --- a/engine/flutter/shell/platform/linux/BUILD.gn +++ b/engine/flutter/shell/platform/linux/BUILD.gn @@ -32,9 +32,7 @@ if (build_glfw_shell) { # TODO: Remove this target once the _glfw copy is being uploaded instead. See # https://github.com/flutter/flutter/issues/38589 shared_library("flutter_linux") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] configs += [ ":disable_fatal_link_warnings" ] @@ -42,9 +40,7 @@ if (build_glfw_shell) { } shared_library("flutter_linux_glfw") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] configs += [ ":disable_fatal_link_warnings" ] diff --git a/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc b/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc index c8b258173a5460c6687b550f4b76c07155ce3674..48a76c8edd6c6ab729e37a1cc4a8066e7387a010 100644 --- a/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc +++ b/engine/flutter/shell/platform/ohos/ace_vsync_waiter_embedder.cc @@ -89,4 +89,5 @@ float VsyncWaiterEmbedder::GetDisplayRefreshRate() const { return 60.0f; } + } // namespace flutter diff --git a/engine/flutter/shell/platform/ohos/ohos_surface.h b/engine/flutter/shell/platform/ohos/ohos_surface.h index 599dea11b2df9db5b9c67988debeaf547cba3ff5..158f6d219da55b5edace2e6f70f4783de031d81d 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface.h +++ b/engine/flutter/shell/platform/ohos/ohos_surface.h @@ -27,7 +27,7 @@ class OhosSurface { virtual bool OnScreenSurfaceResize(const SkISize& size) = 0; - virtual void SetPlatformWindow(::OHOS::Window* window) = 0; + virtual void SetPlatformWindow(const ::OHOS::sptr<::OHOS::Window> &window) = 0; }; } // namespace flutter diff --git a/engine/flutter/shell/platform/ohos/ohos_surface_software.cc b/engine/flutter/shell/platform/ohos/ohos_surface_software.cc index 1667986cc0e6cb62b173b876b81fc5456ed2ec01..2cb0db2ff6bc80d0d3488e79d58fb44b9a2e4abc 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface_software.cc +++ b/engine/flutter/shell/platform/ohos/ohos_surface_software.cc @@ -66,24 +66,31 @@ std::unique_ptr OhosSurfaceSoftware::CreateGPUSurface() bool OhosSurfaceSoftware::OnScreenSurfaceResize(const SkISize& size) { + FML_LOG(INFO) << "OhosSurfaceSoftware::OnScreenSurfaceResize, software surface do noting"; requestConfig_.width = size.fWidth; requestConfig_.height = size.fHeight; return true; } -void OhosSurfaceSoftware::SetPlatformWindow(OHOS::Window* window) +void OhosSurfaceSoftware::SetPlatformWindow(const OHOS::sptr &window) { if (window == nullptr) { FML_LOG(ERROR) << "OhosSurfaceSoftware::SetPlatformWindow, window is nullptr"; return; } window_ = window; - window_->GetRequestConfig(requestConfig_); surface_ = window->GetSurface(); if (surface_ == nullptr) { FML_LOG(ERROR) << "OhosSurfaceSoftware::SetPlatformWindow, surface_ is nullptr"; return; } + requestConfig_ = { + .width = surface_->GetDefaultWidth(), + .height = surface_->GetDefaultHeight(), + .strideAlignment = 0x8, + .format = PIXEL_FMT_RGBA_8888, + .usage = surface_->GetDefaultUsage(), + }; // Set buffer size to 5 for enough buffer surface_->SetQueueSize(5); } @@ -127,14 +134,11 @@ bool OhosSurfaceSoftware::PresentBackingStore( FML_LOG(ERROR) << "OhosSurfaceSoftware surface is nullptr"; return false; } - int32_t pixelBase = 16; - int32_t convertWidth = requestConfig_.width % pixelBase == 0 ? requestConfig_.width - : (requestConfig_.width / pixelBase + 1) * pixelBase; - int32_t alignment = 8; + OHOS::BufferRequestConfig requestConfig = { - .width = convertWidth, + .width = requestConfig_.width, .height = requestConfig_.height, - .strideAlignment = alignment, + .strideAlignment = 8, .format = PIXEL_FMT_RGBA_8888, .usage = HBM_USE_CPU_READ | HBM_USE_CPU_WRITE | HBM_USE_MEM_DMA, .timeout = 0, @@ -143,20 +147,28 @@ bool OhosSurfaceSoftware::PresentBackingStore( int32_t releaseFence; OHOS::SurfaceError ret = surface_->RequestBuffer(surfaceBuffer, releaseFence, requestConfig); - if (ret != OHOS::SURFACE_ERROR_OK || surfaceBuffer == nullptr || surfaceBuffer->GetSize() == 0) { - FML_LOG(ERROR) << "OhosSurfaceSoftware request surfaceBuffer fail"; + if (ret != OHOS::SURFACE_ERROR_OK) { + FML_LOG(ERROR) << "OhosSurfaceSoftware RequestBuffer failed"; return false; } - SurfaceDrawBuffer(requestConfig, surfaceBuffer, pixmap); - SurfaceFlushBuffer(surfaceBuffer); + if (surfaceBuffer == nullptr) { + FML_LOG(ERROR) << "OhosSurfaceSoftware surfaceBuffer is nullptr"; + return false; + } - return true; -} + if (surfaceBuffer->GetVirAddr() == nullptr) { + FML_LOG(ERROR) << "OhosSurfaceSoftware surfaceBuffer addr is nullptr"; + return false; + } + + if (surfaceBuffer->GetSize() == 0) { + FML_LOG(ERROR) << "OhosSurfaceSoftware surfaceBuffer size error"; + return false; + } + + memset(surfaceBuffer->GetVirAddr(), 0, surfaceBuffer->GetSize()); -void OhosSurfaceSoftware::SurfaceDrawBuffer( - OHOS::BufferRequestConfig& requestConfig, OHOS::sptr surfaceBuffer, SkPixmap& pixmap) -{ SkColorType color_type; SkAlphaType alpha_type; if (GetSkColorType(requestConfig.format, &color_type, &alpha_type)) { @@ -174,10 +186,7 @@ void OhosSurfaceSoftware::SurfaceDrawBuffer( } } } -} -void OhosSurfaceSoftware::SurfaceFlushBuffer(OHOS::sptr surfaceBuffer) -{ FML_LOG(INFO) << "OhosSurfaceSoftware flush buffer"; OHOS::BufferFlushConfig flushConfig = { .damage = { @@ -189,10 +198,13 @@ void OhosSurfaceSoftware::SurfaceFlushBuffer(OHOS::sptr sur .timestamp = 0 }; surface_->FlushBuffer(surfaceBuffer, -1, flushConfig); + + return true; } ExternalViewEmbedder* OhosSurfaceSoftware::GetExternalViewEmbedder() { return nullptr; } + } // namespace flutter diff --git a/engine/flutter/shell/platform/ohos/ohos_surface_software.h b/engine/flutter/shell/platform/ohos/ohos_surface_software.h index 60a5ab7cc8be84c7f642da23eebfc54844b71763..831ee42005d82a18e6b04e967b6c19d8f0134df2 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface_software.h +++ b/engine/flutter/shell/platform/ohos/ohos_surface_software.h @@ -26,17 +26,12 @@ class OhosSurfaceSoftware final : public OhosSurface, bool OnScreenSurfaceResize(const SkISize& size) override; - void SetPlatformWindow(OHOS::Window* window) override; + void SetPlatformWindow(const OHOS::sptr &window) override; sk_sp AcquireBackingStore(const SkISize& size) override; bool PresentBackingStore(sk_sp backing_store) override; - void SurfaceDrawBuffer( - OHOS::BufferRequestConfig& requestConfig, OHOS::sptr surfaceBuffer, SkPixmap& pixmap); - - void SurfaceFlushBuffer(OHOS::sptr); - ExternalViewEmbedder* GetExternalViewEmbedder() override; private: @@ -44,12 +39,13 @@ class OhosSurfaceSoftware final : public OhosSurface, SkColorType target_color_type_; SkAlphaType target_alpha_type_; - OHOS::Window* window_ = nullptr; + OHOS::sptr window_ = nullptr; OHOS::BufferRequestConfig requestConfig_; OHOS::sptr surface_ = nullptr; FML_DISALLOW_COPY_AND_ASSIGN(OhosSurfaceSoftware); }; + } // namespace flutter #endif // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_SOFTWARE_H_ diff --git a/engine/flutter/shell/platform/ohos/platform_view_ohos.cc b/engine/flutter/shell/platform/ohos/platform_view_ohos.cc index 54c227c6506b341a7b4e1bbd9760fa3ed1dbd652..862e1a251cb9c410767b97a7ea172eb08f7068b6 100644 --- a/engine/flutter/shell/platform/ohos/platform_view_ohos.cc +++ b/engine/flutter/shell/platform/ohos/platform_view_ohos.cc @@ -26,7 +26,7 @@ PlatformViewOhos::PlatformViewOhos( } } -void PlatformViewOhos::NotifyCreated(::OHOS::Window* window) +void PlatformViewOhos::NotifyCreated(const ::OHOS::sptr<::OHOS::Window> &window) { if (surface_) { surface_->SetPlatformWindow(window); diff --git a/engine/flutter/shell/platform/ohos/platform_view_ohos.h b/engine/flutter/shell/platform/ohos/platform_view_ohos.h index 9bbbb02d37ed74186c75c738f3eedcaf0ac5a476..1db430537c059eb93ab351a3b4af7ea35e60aeac 100644 --- a/engine/flutter/shell/platform/ohos/platform_view_ohos.h +++ b/engine/flutter/shell/platform/ohos/platform_view_ohos.h @@ -16,7 +16,7 @@ class PlatformViewOhos final : public PlatformView { public: PlatformViewOhos(PlatformView::Delegate& delegate, flutter::TaskRunners task_runners, bool use_software_rendering); - void NotifyCreated(::OHOS::Window* window); + void NotifyCreated(const ::OHOS::sptr<::OHOS::Window> &window); void NotifyChanged(const SkISize& size); std::unique_ptr CreateRenderingSurface(); std::unique_ptr CreateVSyncWaiter(int32_t platform); diff --git a/engine/flutter/shell/platform/windows/BUILD.gn b/engine/flutter/shell/platform/windows/BUILD.gn index 9c65762b8be3695faef3bb5bf8b0adb03e13bf6b..7bc108eacdfb60cb45b0c8732cc099444c14a189 100644 --- a/engine/flutter/shell/platform/windows/BUILD.gn +++ b/engine/flutter/shell/platform/windows/BUILD.gn @@ -25,9 +25,8 @@ config("relative_flutter_windows_headers") { source_set("flutter_windows_headers") { public = _public_headers - public_deps = [ - "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "$flutter_root/shell/platform/common/cpp:desktop_library_implementation", @@ -74,7 +73,11 @@ source_set("flutter_windows_source") { "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper", "$flutter_root/shell/platform/embedder:embedder_with_symbol_prefix", "$flutter_root/shell/platform/windows/client_wrapper:client_wrapper_windows", - "//third_party/angle:libEGL_static", # the order of libEGL_static and libGLESv2_static is important.. if reversed, will cause a linker error DllMain already defined in LIBCMTD.lib + "//third_party/angle:libEGL_static", # the order of libEGL_static and + # libGLESv2_static is important.. if + # reversed, will cause a linker error + # DllMain already defined in + # LIBCMTD.lib "//third_party/angle:libGLESv2_static", "//third_party/rapidjson", ] @@ -82,20 +85,14 @@ source_set("flutter_windows_source") { copy("publish_headers_windows") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] # The Windows header assumes the presence of the common headers. - deps = [ - "$flutter_root/shell/platform/common/cpp:publish_headers", - ] + deps = [ "$flutter_root/shell/platform/common/cpp:publish_headers" ] } shared_library("flutter_windows_win32") { - deps = [ - ":flutter_windows_source", - ] + deps = [ ":flutter_windows_source" ] public_configs = [ "$flutter_root:config" ] } @@ -103,17 +100,13 @@ shared_library("flutter_windows_win32") { # TODO: Remove this target once the _glfw copy is being uploaded instead. See # https://github.com/flutter/flutter/issues/38589 shared_library("flutter_windows") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] public_configs = [ "$flutter_root:config" ] } shared_library("flutter_windows_glfw") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] public_configs = [ "$flutter_root:config" ] } @@ -137,9 +130,7 @@ group("windows_glfw") { } group("windows") { - deps = [ - ":windows_win32", - ] + deps = [ ":windows_win32" ] if (build_glfw_shell) { deps += [ ":windows_glfw" ] } diff --git a/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn b/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn index bbd48c67df33ad0704862ff84bb0769a673c5123..116d6b67c8460a0b08a282dedd1fd1054d0d20d6 100644 --- a/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn +++ b/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn @@ -56,9 +56,8 @@ source_set("client_wrapper_library_stubs_windows") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "$flutter_root/shell/platform/windows:flutter_windows_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/windows:flutter_windows_headers" ] } test_fixtures("client_wrapper_windows_fixtures") { @@ -69,9 +68,7 @@ executable("client_wrapper_windows_unittests") { testonly = true # TODO: Add more unit tests. - sources = [ - "flutter_window_controller_unittests.cc", - ] + sources = [ "flutter_window_controller_unittests.cc" ] deps = [ ":client_wrapper_library_stubs_windows", diff --git a/engine/flutter/shell/testing/BUILD.gn b/engine/flutter/shell/testing/BUILD.gn index 9daca896faf3278794d88278392cc88df1aaa2ea..f84a5f984ca49cf2103ecff6824b6c9429876f26 100644 --- a/engine/flutter/shell/testing/BUILD.gn +++ b/engine/flutter/shell/testing/BUILD.gn @@ -14,9 +14,7 @@ executable("testing") { "$flutter_root:export_dynamic_symbols", ] - sources = [ - "tester_main.cc", - ] + sources = [ "tester_main.cc" ] deps = [ "$flutter_root/assets", diff --git a/engine/flutter/sky/BUILD.gn b/engine/flutter/sky/BUILD.gn index b950560f5a0803645e3f202c3815d7a401a72258..e40da9cab65336ba25a48f9d645be6ad195d4fdf 100644 --- a/engine/flutter/sky/BUILD.gn +++ b/engine/flutter/sky/BUILD.gn @@ -5,9 +5,7 @@ group("sky") { testonly = true - deps = [ - "$flutter_root/sky/packages", - ] + deps = [ "$flutter_root/sky/packages" ] if (!is_fuchsia) { deps += [ "$flutter_root/shell" ] diff --git a/engine/flutter/sky/dist/BUILD.gn b/engine/flutter/sky/dist/BUILD.gn index c1b564a03ecce124dc17d66b2dafdb3c8628d241..d2c1655941e1ddfbed46c4c5768d666e21ef00d7 100644 --- a/engine/flutter/sky/dist/BUILD.gn +++ b/engine/flutter/sky/dist/BUILD.gn @@ -9,12 +9,8 @@ if (is_android) { source = "$flutter_root/sky/packages/flutter_services" dest = "$root_build_dir/dist/packages/flutter_services" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", @@ -23,9 +19,7 @@ if (is_android) { rebase_path(dest), ] - deps = [ - "$flutter_root/sky/packages/flutter_services", - ] + deps = [ "$flutter_root/sky/packages/flutter_services" ] } action("sky_engine") { script = "$flutter_root/sky/tools/dist_dart_pkg.py" @@ -33,12 +27,8 @@ if (is_android) { source = "$root_gen_dir/dart-pkg/sky_engine" dest = "$root_build_dir/dist/packages/sky_engine" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", @@ -59,12 +49,8 @@ if (is_android) { source = "$root_gen_dir/dart-pkg/sky_services" dest = "$root_build_dir/dist/packages/sky_services" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", diff --git a/engine/flutter/sky/packages/flutter_services/BUILD.gn b/engine/flutter/sky/packages/flutter_services/BUILD.gn index 6ec4f4b2e4504dea13226925034995f000c72628..81019e2dabea7c92938bc1ebcc45c4fab8fff85b 100644 --- a/engine/flutter/sky/packages/flutter_services/BUILD.gn +++ b/engine/flutter/sky/packages/flutter_services/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("flutter_services") { - deps = [ - "$flutter_root/sky/packages/sky_services", - ] + deps = [ "$flutter_root/sky/packages/sky_services" ] } diff --git a/engine/flutter/sky/packages/sky_engine/BUILD.gn b/engine/flutter/sky/packages/sky_engine/BUILD.gn index 031cdbe979b50687e9490145d5db0579262ae2c0..687242a334b52e7e3bf804564cd7e1d43f0cc8b1 100644 --- a/engine/flutter/sky/packages/sky_engine/BUILD.gn +++ b/engine/flutter/sky/packages/sky_engine/BUILD.gn @@ -15,17 +15,14 @@ import("//third_party/dart/sdk/lib/io/io_sources.gni") import("//third_party/dart/sdk/lib/isolate/isolate_sources.gni") import("//third_party/dart/sdk/lib/math/math_sources.gni") import("//third_party/dart/sdk/lib/typed_data/typed_data_sources.gni") +import("$flutter_root/build/dart/rules.gni") import("$flutter_root/lib/ui/dart_ui.gni") if (!is_fuchsia) { copy("copy_sky_engine_authors") { - sources = [ - "//AUTHORS", - ] + sources = [ "//AUTHORS" ] - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/{{source_file_part}}" ] } } @@ -34,9 +31,8 @@ dart_sdk_lib_path = rebase_path("//third_party/dart/sdk/lib") copy("async") { lib_path = rebase_path("async", "", dart_sdk_lib_path) sources = rebase_path(async_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}" ] } copy("collection") { @@ -50,73 +46,62 @@ copy("collection") { copy("convert") { lib_path = rebase_path("convert", "", dart_sdk_lib_path) sources = rebase_path(convert_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}" ] } copy("core") { lib_path = rebase_path("core", "", dart_sdk_lib_path) sources = rebase_path(core_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}" ] } copy("developer") { lib_path = rebase_path("developer", "", dart_sdk_lib_path) sources = rebase_path(developer_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}" ] } copy("_http") { lib_path = rebase_path("_http", "", dart_sdk_lib_path) sources = rebase_path(http_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}" ] } copy("internal") { lib_path = rebase_path("internal", "", dart_sdk_lib_path) sources = rebase_path(internal_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}" ] } copy("io") { lib_path = rebase_path("io", "", dart_sdk_lib_path) sources = rebase_path(io_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}" ] } copy("ffi") { lib_path = rebase_path("ffi", "", dart_sdk_lib_path) sources = rebase_path(ffi_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/ffi/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ffi/{{source_file_part}}" ] } copy("isolate") { lib_path = rebase_path("isolate", "", dart_sdk_lib_path) sources = rebase_path(isolate_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}" ] } copy("math") { lib_path = rebase_path("math", "", dart_sdk_lib_path) sources = rebase_path(math_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}" ] } copy("typed_data") { @@ -130,9 +115,7 @@ copy("typed_data") { copy("copy_dart_ui") { sources = dart_ui_files - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}" ] } group("copy_dart_sdk") { diff --git a/engine/flutter/sky/packages/sky_services/BUILD.gn b/engine/flutter/sky/packages/sky_services/BUILD.gn index 73ecf5668e0cbfb07f1948c5ae3d05974639d6b6..7878930ff04d6796d3ee4d76bd4654315b3be319 100644 --- a/engine/flutter/sky/packages/sky_services/BUILD.gn +++ b/engine/flutter/sky/packages/sky_services/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("$flutter_root/build/dart/rules.gni") if (!is_fuchsia) { copy("copy_sky_services_license") { @@ -10,9 +11,7 @@ if (!is_fuchsia) { "//LICENSE", ] - outputs = [ - "$root_gen_dir/dart-pkg/sky_services/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_services/{{source_file_part}}" ] } } @@ -23,8 +22,6 @@ dart_pkg("sky_services") { ] if (!is_fuchsia) { - deps = [ - ":copy_sky_services_license", - ] + deps = [ ":copy_sky_services_license" ] } } diff --git a/engine/flutter/testing/BUILD.gn b/engine/flutter/testing/BUILD.gn index b613afee0348c29d9823c672906ee2f38ec217ec..59140d5952e0f1f58f953a67aad80346f852fcc4 100644 --- a/engine/flutter/testing/BUILD.gn +++ b/engine/flutter/testing/BUILD.gn @@ -27,9 +27,7 @@ source_set("testing") { "$flutter_root/testing/thread_test.h", ] - public_deps = [ - ":testing_lib", - ] + public_deps = [ ":testing_lib" ] } source_set("dart") { diff --git a/engine/flutter/testing/testing.gni b/engine/flutter/testing/testing.gni index 2356f45bfa7de1e547a15eb877ceb265ac364edc..3810011eb8c5c66230b8876d9080bd39b4a9d088 100644 --- a/engine/flutter/testing/testing.gni +++ b/engine/flutter/testing/testing.gni @@ -27,9 +27,7 @@ template("fixtures_location") { source_set(target_name) { public = [] - sources = [ - location_source_path, - ] + sources = [ location_source_path ] } } @@ -62,13 +60,9 @@ template("dart_snapshot_kernel") { script = "$root_out_dir/frontend_server.dart.snapshot" - inputs = [ - invoker.dart_main, - ] + inputs = [ invoker.dart_main ] - outputs = [ - invoker.dart_kernel, - ] + outputs = [ invoker.dart_kernel ] snapshot_depfile = "$target_gen_dir/snapshot_$target_name.depfile.d" depfile = snapshot_depfile @@ -117,9 +111,7 @@ template("dart_snapshot_aot") { tool = "//third_party/dart/runtime/bin:gen_snapshot" - inputs = [ - invoker.dart_kernel, - ] + inputs = [ invoker.dart_kernel ] vm_snapshot_data = "$target_gen_dir/assets/vm_snapshot_data" vm_snapshot_instr = "$target_gen_dir/assets/vm_snapshot_instr" @@ -172,9 +164,7 @@ template("dart_snapshot") { dart_snapshot_aot_target_name = "dart_snapshot_aot_$target_name" dart_snapshot_aot(dart_snapshot_aot_target_name) { dart_kernel = dart_snapshot_kernel_path - deps = [ - ":$dart_snapshot_kernel_target_name", - ] + deps = [ ":$dart_snapshot_kernel_target_name" ] } snapshot_deps += [ ":$dart_snapshot_aot_target_name" ] } @@ -205,9 +195,7 @@ template("copy_fixtures") { if (has_fixtures) { copy(target_name) { sources = invoker.fixtures - outputs = [ - "$target_gen_dir/assets/{{source_file_part}}", - ] + outputs = [ "$target_gen_dir/assets/{{source_file_part}}" ] } } else { group(target_name) { diff --git a/engine/flutter/third_party/txt/BUILD.gn b/engine/flutter/third_party/txt/BUILD.gn index d77d4b9c9f41da945ed24d58de061550ce503e79..5284c53397d0b5eff4a8e1f4229c6b8b0bddd02b 100644 --- a/engine/flutter/third_party/txt/BUILD.gn +++ b/engine/flutter/third_party/txt/BUILD.gn @@ -130,9 +130,7 @@ source_set("txt") { "//third_party/skia", ] - deps = [ - "//third_party/skia", - ] + deps = [ "//third_party/skia" ] if (flutter_use_fontconfig) { deps += [ "//third_party/fontconfig" ] @@ -164,8 +162,8 @@ source_set("txt") { } txt_common_executable_deps = [ - "//third_party/dart/runtime:libdart_jit", # For logging. "$flutter_root/fml", # For ICU initialization. + "//third_party/dart/runtime:libdart_jit", # For logging. ] source_set("txt_test_utils") { diff --git a/engine/flutter/third_party/txt/src/minikin/FontCollection.cpp b/engine/flutter/third_party/txt/src/minikin/FontCollection.cpp index f4d18c0296252a79fe69b9a54df713a8080fd353..e2379e80ca79646813d30b5ed9e29d2a1cbf251c 100644 --- a/engine/flutter/third_party/txt/src/minikin/FontCollection.cpp +++ b/engine/flutter/third_party/txt/src/minikin/FontCollection.cpp @@ -298,6 +298,27 @@ const std::shared_ptr& FontCollection::getFamilyForChar( uint32_t vs, uint32_t langListId, int variant) const { + // First find font in hw theme. + for (size_t k = 0; k < mFamilies.size(); k++) { + if (NULL == mFamilies[k]) { + continue; + } + if (mFamilies[k]->getHwFontFamilyType() > 0) { + if(mFamilies[k] ->getCoverage().get(ch)) { + return mFamilies[k]; + } + } + } + + if (mFallbackFontProvider) { + const std::shared_ptr& fallback = + mFallbackFontProvider->matchFallbackFontFromHwFont(ch, + GetFontLocale(langListId)); + if (fallback) { + return fallback; + } + } + if (ch >= mMaxChar) { // libtxt: check if the fallback font provider can match this character if (mFallbackFontProvider) { @@ -311,6 +332,13 @@ const std::shared_ptr& FontCollection::getFamilyForChar( return mFamilies[0]; } + // 0x1000 to 0x109f is range of Burmese, force ch to 0x1000 or 0x1050 to match Z-encoding and U-encoding of Burmese. + if (ch >= 0x1000 && ch <= 0x109f) { + const uint32_t ZAWGYI_START_CODE = 0x1000; + const uint32_t UNICODE_START_CODE = 0x1050; + ch = mIsZawgyiMyanmar ? ZAWGYI_START_CODE : UNICODE_START_CODE; // 0x1050 is exist in U-encoding of Burmese only. + } + Range range = mRanges[ch >> kLogCharsPerPage]; if (vs != 0) { diff --git a/engine/flutter/third_party/txt/src/minikin/FontCollection.h b/engine/flutter/third_party/txt/src/minikin/FontCollection.h index 48365a64ac8414ea925024d6775aba399581ae23..e437d9fe32a2fb75e02574159fb2d82831aac31d 100644 --- a/engine/flutter/third_party/txt/src/minikin/FontCollection.h +++ b/engine/flutter/third_party/txt/src/minikin/FontCollection.h @@ -40,6 +40,9 @@ class FontCollection { virtual const std::shared_ptr& matchFallbackFont( uint32_t ch, std::string locale) = 0; + virtual const std::shared_ptr& matchFallbackFontFromHwFont( + uint32_t ch, + std::string locale) = 0; }; struct Run { @@ -77,6 +80,10 @@ class FontCollection { mFallbackFontProvider = std::move(ffp); } + void SetIsZawgyiMyanmar(bool isZawgyiMyanmar) { + mIsZawgyiMyanmar = isZawgyiMyanmar; + } + private: static const int kLogCharsPerPage = 8; static const int kPageMask = (1 << kLogCharsPerPage) - 1; @@ -148,6 +155,8 @@ class FontCollection { // libtxt extension: Fallback font provider. std::unique_ptr mFallbackFontProvider; + + bool mIsZawgyiMyanmar = false; }; } // namespace minikin diff --git a/engine/flutter/third_party/txt/src/minikin/FontFamily.cpp b/engine/flutter/third_party/txt/src/minikin/FontFamily.cpp index 9f66e72f2f520fac59fbb5dac9d4880b475d4df3..f83423b6d36a4c5ce6b9a2d3b4972b0b20ddf0cb 100644 --- a/engine/flutter/third_party/txt/src/minikin/FontFamily.cpp +++ b/engine/flutter/third_party/txt/src/minikin/FontFamily.cpp @@ -124,6 +124,14 @@ bool FontFamily::analyzeStyle(const std::shared_ptr& typeface, italic); } +int FontFamily::getHwFontFamilyType() { + return mHwFontFamilyType; +} + +void FontFamily::setHwFontFamilyType(int HwFontFamilyType) { + mHwFontFamilyType = HwFontFamilyType; +} + // Compute a matching metric between two styles - 0 is an exact match static int computeMatch(FontStyle style1, FontStyle style2) { if (style1 == style2) diff --git a/engine/flutter/third_party/txt/src/minikin/FontFamily.h b/engine/flutter/third_party/txt/src/minikin/FontFamily.h index aac7a0d62bd12ae5a344a553bd11e0d08fbfaf1c..aedb92cf7d9419353ccef960ec01a1369da79302 100644 --- a/engine/flutter/third_party/txt/src/minikin/FontFamily.h +++ b/engine/flutter/third_party/txt/src/minikin/FontFamily.h @@ -173,6 +173,9 @@ class FontFamily { std::shared_ptr createFamilyWithVariation( const std::vector& variations) const; + int getHwFontFamilyType(); + void setHwFontFamilyType(int type); + private: void computeCoverage(); @@ -183,6 +186,7 @@ class FontFamily { SparseBitSet mCoverage; bool mHasVSTable; + int mHwFontFamilyType = 0; // Forbid copying and assignment. FontFamily(const FontFamily&) = delete; diff --git a/engine/flutter/third_party/txt/src/minikin/Layout.cpp b/engine/flutter/third_party/txt/src/minikin/Layout.cpp index 66172f3471eac482f9a3f3bdd45a937e03dcf156..1ce0712f4185b2ec2f7e619ccfd0a877f860b1bb 100644 --- a/engine/flutter/third_party/txt/src/minikin/Layout.cpp +++ b/engine/flutter/third_party/txt/src/minikin/Layout.cpp @@ -1104,6 +1104,7 @@ void Layout::doLayoutRun(const uint16_t* buf, } else { ctx->paint.font->GetBounds(&glyphBounds, glyph_ix, ctx->paint); } + xAdvance = std::max(xAdvance, glyphBounds.mRight); glyphBounds.offset(x + xoff, y + yoff); mBounds.join(glyphBounds); if (static_cast(info[i].cluster - clusterOffset) < count) { diff --git a/engine/flutter/third_party/txt/src/minikin/LineBreaker.h b/engine/flutter/third_party/txt/src/minikin/LineBreaker.h index 529dd1d45f01777dc9faa45134c41fa9c8b68f89..15116bf2798884dda5d3faa3a169aaa363bba03f 100644 --- a/engine/flutter/third_party/txt/src/minikin/LineBreaker.h +++ b/engine/flutter/third_party/txt/src/minikin/LineBreaker.h @@ -235,7 +235,7 @@ class LineBreaker { // layout parameters BreakStrategy mStrategy = kBreakStrategy_Greedy; - WordBreakType mWordBreakType = WordBreakType::kWordBreakType_Normal; + WordBreakType mWordBreakType = WordBreakType::kWordBreakType_BreakWord; HyphenationFrequency mHyphenationFrequency = kHyphenationFrequency_Normal; bool mJustified; LineWidths mLineWidths; diff --git a/engine/flutter/third_party/txt/src/txt/font_collection.cc b/engine/flutter/third_party/txt/src/txt/font_collection.cc index f54323306d90d8e8e3afd65c98a9fd6e4980ed4a..eb8ae349764f1485ac542dfd9a44cc8b699608a4 100644 --- a/engine/flutter/third_party/txt/src/txt/font_collection.cc +++ b/engine/flutter/third_party/txt/src/txt/font_collection.cc @@ -78,6 +78,12 @@ class TxtFallbackFontProvider } } + virtual const std::shared_ptr& matchFallbackFontFromHwFont( + uint32_t ch, + std::string locale) { + return g_null_family; + } + private: std::weak_ptr font_collection_; }; @@ -91,10 +97,12 @@ size_t FontCollection::GetFontManagersCount() const { } void FontCollection::SetupDefaultFontManager() { + std::lock_guard lock(fontManagerMutex_); default_font_manager_ = GetDefaultFontManager(); } void FontCollection::SetDefaultFontManager(sk_sp font_manager) { + std::lock_guard lock(fontManagerMutex_); default_font_manager_ = font_manager; } @@ -110,6 +118,11 @@ void FontCollection::SetTestFontManager(sk_sp font_manager) { test_font_manager_ = font_manager; } +sk_sp FontCollection::GetDefaultFontManagerSafely() const { + std::lock_guard lock(fontManagerMutex_); + return default_font_manager_; +} + // Return the available font managers in the order they should be queried. std::vector> FontCollection::GetFontManagerOrder() const { std::vector> order; @@ -119,8 +132,9 @@ std::vector> FontCollection::GetFontManagerOrder() const { order.push_back(asset_font_manager_); if (test_font_manager_) order.push_back(test_font_manager_); - if (default_font_manager_) - order.push_back(default_font_manager_); + auto defaultFontManager = GetDefaultFontManagerSafely(); + if (defaultFontManager) + order.push_back(defaultFontManager); return order; } @@ -339,18 +353,30 @@ void FontCollection::ClearFontFamilyCache() { std::swap(font_collections_cache_, font_collections_cache); } -void FontCollection::VaryFontCollectionWithFontWeightScale(float fontWeightScale) { - if (fontWeightScale > 0.0f && fontWeightScale != fontWeightScale_) { +void FontCollection::VaryFontCollectionWithFontWeightScale(float font_weight_scale) { + if (font_weight_scale > 0.0f && font_weight_scale != font_weight_scale_) { decltype(fallback_fonts_) fallback_fonts; std::lock_guard lock(mutex_); - fontWeightScale_ = fontWeightScale; - variedFonts_.clear(); + font_weight_scale_ = font_weight_scale; + varied_fonts_.clear(); fallback_fonts = std::move(fallback_fonts_); fallback_match_cache_.clear(); fallback_fonts_for_locale_.clear(); } } +void FontCollection::LoadSystemFont() { +} + +void FontCollection::SetIsZawgyiMyanmar(bool is_zawgyi_myanmar) { + if (is_zawgyi_myanmar_ == is_zawgyi_myanmar) { + return; + } + is_zawgyi_myanmar_ = is_zawgyi_myanmar; + LoadSystemFont(); +} + + #if FLUTTER_ENABLE_SKSHAPER sk_sp @@ -358,7 +384,7 @@ FontCollection::CreateSktFontCollection() { sk_sp skt_collection = sk_make_sp(); - skt_collection->setDefaultFontManager(default_font_manager_, + skt_collection->setDefaultFontManager(GetDefaultFontManagerSafely(), GetDefaultFontFamily().c_str()); skt_collection->setAssetFontManager(asset_font_manager_); skt_collection->setDynamicFontManager(dynamic_font_manager_); diff --git a/engine/flutter/third_party/txt/src/txt/font_collection.h b/engine/flutter/third_party/txt/src/txt/font_collection.h index 9dc25a4402d877829875f8ca1aea5ef856d52763..a8f47c7ce90190e5c520b3a1c1004d88df9cf0fb 100644 --- a/engine/flutter/third_party/txt/src/txt/font_collection.h +++ b/engine/flutter/third_party/txt/src/txt/font_collection.h @@ -69,7 +69,11 @@ class FontCollection : public std::enable_shared_from_this { void ClearFontFamilyCache(); // Vary font collection with font weight scale. - void VaryFontCollectionWithFontWeightScale(float fontWeightScale); + void VaryFontCollectionWithFontWeightScale(float font_weight_scale); + + void LoadSystemFont(); + + void SetIsZawgyiMyanmar(bool is_zawgyi_myanmar); #if FLUTTER_ENABLE_SKSHAPER @@ -110,10 +114,12 @@ class FontCollection : public std::enable_shared_from_this { std::unordered_map> fallback_fonts_for_locale_; bool enable_font_fallback_; - float fontWeightScale_ = 1.0f; - std::vector variedFonts_; + bool is_zawgyi_myanmar_ = false; // whether encoding of Burmese is zawgyi, not unicode. + float font_weight_scale_ = 1.0f; + std::vector varied_fonts_; std::mutex mutex_; + mutable std::mutex fontManagerMutex_; // Performs the actual work of MatchFallbackFont. The result is cached in // fallback_match_cache_. @@ -134,6 +140,8 @@ class FontCollection : public std::enable_shared_from_this { const sk_sp& manager, const std::string& family_name); + sk_sp GetDefaultFontManagerSafely() const; + FML_DISALLOW_COPY_AND_ASSIGN(FontCollection); }; diff --git a/engine/flutter/third_party/txt/src/txt/paragraph.h b/engine/flutter/third_party/txt/src/txt/paragraph.h index a197cddd8315f7f743587089d81429adf191c02b..5e564af67e45663d209a4b32bb40edf8b85c3d87 100644 --- a/engine/flutter/third_party/txt/src/txt/paragraph.h +++ b/engine/flutter/third_party/txt/src/txt/paragraph.h @@ -168,6 +168,9 @@ class Paragraph { virtual PositionWithAffinity GetGlyphPositionAtCoordinate(double dx, double dy) = 0; + virtual PositionWithAffinity GetGlyphPositionAtCoordinateWithCluster(double dx, + double dy) = 0; + // Finds the first and last glyphs that define a word containing the glyph at // index offset. virtual Range GetWordBoundary(size_t offset) = 0; diff --git a/engine/flutter/third_party/txt/src/txt/paragraph_style.h b/engine/flutter/third_party/txt/src/txt/paragraph_style.h index f07817474e58ff209622c371f7806acb9accf24c..196395dfea2a42fae2de1c242a796d0593fded1b 100644 --- a/engine/flutter/third_party/txt/src/txt/paragraph_style.h +++ b/engine/flutter/third_party/txt/src/txt/paragraph_style.h @@ -81,7 +81,7 @@ class ParagraphStyle { minikin::BreakStrategy::kBreakStrategy_Greedy; minikin::WordBreakType word_break_type = - minikin::WordBreakType::kWordBreakType_Normal; + minikin::WordBreakType::kWordBreakType_BreakWord; TextStyle GetTextStyle() const; diff --git a/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc b/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc index 07b88097129a5f40488abbd2c206bc2f09812448..49594991519dcf55583e92facdff9df7454abeb4 100644 --- a/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc +++ b/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc @@ -293,6 +293,7 @@ bool ParagraphTxt::ComputeLineBreaks() { memcpy(breaker_.buffer(), text_.data() + block_start, block_size * sizeof(text_[0])); breaker_.setText(); + breaker_.setIndents(indents_); // Add the runs that include this line to the LineBreaker. double block_total_width = 0; @@ -1191,7 +1192,11 @@ double ParagraphTxt::GetLineXOffset(double line_total_advance, } else if (align == TextAlign::center) { return (width_ - line_total_advance) / 2; } else { - return 0; + if (line_number < indents_.size()) { + return indents_[line_number]; + } else { + return indents_.size() > 0 ? indents_.back() : 0; + } } } @@ -1213,6 +1218,10 @@ double ParagraphTxt::GetMaxIntrinsicWidth() { return max_intrinsic_width_; } +void ParagraphTxt::SetIndents(const std::vector& indents) { + indents_ = indents; +} + double ParagraphTxt::GetMinIntrinsicWidth() { return min_intrinsic_width_; } @@ -1828,6 +1837,89 @@ Paragraph::PositionWithAffinity ParagraphTxt::GetGlyphPositionAtCoordinate( } } +Paragraph::PositionWithAffinity ParagraphTxt::GetGlyphPositionAtCoordinateWithCluster( + double dx, + double dy) { + if (line_heights_.empty()) + return PositionWithAffinity(0, DOWNSTREAM); + + size_t y_index; + for (y_index = 0; y_index < line_heights_.size() - 1; ++y_index) { + if (dy < line_heights_[y_index]) + break; + } + + const std::vector& line_glyph_position = + glyph_lines_[y_index].positions; + if (line_glyph_position.empty()) { + int line_start_index = + std::accumulate(glyph_lines_.begin(), glyph_lines_.begin() + y_index, 0, + [](const int a, const GlyphLine& b) { + return a + static_cast(b.total_code_units); + }); + return PositionWithAffinity(line_start_index, DOWNSTREAM); + } + + size_t x_index; + const GlyphPosition* gp = nullptr; + for (x_index = 0; x_index < line_glyph_position.size(); ++x_index) { + double glyph_end = (x_index < line_glyph_position.size() - 1) + ? line_glyph_position[x_index + 1].x_pos.start + : line_glyph_position[x_index].x_pos.end; + if (dx < glyph_end) { + gp = &line_glyph_position[x_index]; + break; + } + } + + if (gp == nullptr) { + gp = &line_glyph_position.back(); + } + + bool is_cluster_start_setted = false; + size_t cluster_start = 0; + size_t cluster_end = 0; + for (size_t index = 0; index < line_glyph_position.size(); ++index) { + if (line_glyph_position[index].cluster == gp->cluster) { + if (!is_cluster_start_setted) { + cluster_start = index; + cluster_end = index; + is_cluster_start_setted = true; + } else { + cluster_end = index; + } + } + } + + // Find the direction of the run that contains this glyph. + TextDirection direction = TextDirection::ltr; + for (const CodeUnitRun& run : code_unit_runs_) { + if (gp->code_units.start >= run.code_units.start && + gp->code_units.end <= run.code_units.end) { + direction = run.direction; + break; + } + } + + double glyph_center = (gp->x_pos.start + gp->x_pos.end) / 2; + if (cluster_start == cluster_end) { + if ((direction == TextDirection::ltr && dx < glyph_center) || + (direction == TextDirection::rtl && dx >= glyph_center)) { + return PositionWithAffinity(gp->code_units.start, DOWNSTREAM); + } else { + return PositionWithAffinity(gp->code_units.end, UPSTREAM); + } + } else { + glyph_center = (line_glyph_position[cluster_start].x_pos.start + line_glyph_position[cluster_end].x_pos.end) / 2; + if ((direction == TextDirection::ltr && dx < glyph_center) || + (direction == TextDirection::rtl && dx >= glyph_center)) { + return PositionWithAffinity(line_glyph_position[cluster_start].code_units.start, DOWNSTREAM); + } else { + return PositionWithAffinity(line_glyph_position[cluster_end].code_units.end, UPSTREAM); + } + } +} + // We don't cache this because since this returns all boxes, it is usually // unnecessary to call this multiple times in succession. std::vector ParagraphTxt::GetRectsForPlaceholders() { diff --git a/engine/flutter/third_party/txt/src/txt/paragraph_txt.h b/engine/flutter/third_party/txt/src/txt/paragraph_txt.h index c023f0d0762c25f7c145622b74bfa5feef3656fb..37b8d44e296dacc5a5ea0e4547a015c18e24348f 100644 --- a/engine/flutter/third_party/txt/src/txt/paragraph_txt.h +++ b/engine/flutter/third_party/txt/src/txt/paragraph_txt.h @@ -92,7 +92,7 @@ class ParagraphTxt : public Paragraph { // Currently, calculated similarly to as GetLayoutWidth(), however this is not // necessarily 100% correct in all cases. double GetMinIntrinsicWidth() override; - + void SetIndents(const std::vector& indents); std::vector GetRectsForRange( size_t start, size_t end, @@ -102,6 +102,9 @@ class ParagraphTxt : public Paragraph { PositionWithAffinity GetGlyphPositionAtCoordinate(double dx, double dy) override; + PositionWithAffinity GetGlyphPositionAtCoordinateWithCluster(double dx, + double dy) override; + std::vector GetRectsForPlaceholders() override; Range GetWordBoundary(size_t offset) override; @@ -153,6 +156,7 @@ class ParagraphTxt : public Paragraph { // Starting data to layout. std::vector text_; + std::vector indents_; // A vector of PlaceholderRuns, which detail the sizes, positioning and break // behavior of the empty spaces to leave. Each placeholder span corresponds to // a 0xFFFC (object replacement character) in text_, which indicates the diff --git a/engine/flutter/tools/fuchsia/package_dir.gni b/engine/flutter/tools/fuchsia/package_dir.gni index 93006f2ecd8cb0108b38bc3cb582ef4af4bf22e8..e31c8ac59db92e61e533d7a5d4c6889a7b9743da 100644 --- a/engine/flutter/tools/fuchsia/package_dir.gni +++ b/engine/flutter/tools/fuchsia/package_dir.gni @@ -58,12 +58,8 @@ template("package_dir") { cmx_target = "$pkg_target_name.copy_cmx" copy("$cmx_target") { - sources = [ - "${meta_dir}/${pkg_target_name}.cmx", - ] - outputs = [ - "$far_base_dir/meta/{{source_file_part}}", - ] + sources = [ "${meta_dir}/${pkg_target_name}.cmx" ] + outputs = [ "$far_base_dir/meta/{{source_file_part}}" ] } action(target_name) { diff --git a/engine/flutter/web_sdk/BUILD.gn b/engine/flutter/web_sdk/BUILD.gn index 588594204d45120e54f4e462d4bc9f1f1156ce66..cd4bc24c744b38b32b90e62ad9cabc33e0894587 100644 --- a/engine/flutter/web_sdk/BUILD.gn +++ b/engine/flutter/web_sdk/BUILD.gn @@ -51,9 +51,7 @@ prebuilt_dart_action("web_ui_sources") { "--ui", ] - outputs = [ - "$root_out_dir/flutter_web_engine_sdk_stamp", - ] + outputs = [ "$root_out_dir/flutter_web_engine_sdk_stamp" ] foreach(source_file, web_ui_sources) { path = rebase_path(source_file) @@ -75,9 +73,7 @@ prebuilt_dart_action("web_engine_sources") { "--engine", ] - outputs = [ - "$root_out_dir/flutter_web_sdk_stamp", - ] + outputs = [ "$root_out_dir/flutter_web_sdk_stamp" ] foreach(source_file, web_engine_sources) { path = rebase_path(source_file) @@ -86,13 +82,9 @@ prebuilt_dart_action("web_engine_sources") { } copy("web_ui_library") { - sources = [ - "$flutter_root/web_sdk/libraries.json", - ] + sources = [ "$flutter_root/web_sdk/libraries.json" ] - outputs = [ - "$root_out_dir/flutter_web_sdk/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/flutter_web_sdk/{{source_file_part}}" ] } prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { @@ -102,9 +94,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp", ] - inputs = [ - "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart", - ] + inputs = [ "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart" ] outputs = [ sdk_dill, diff --git a/flutter/examples/flutter_gallery/BUILD.gn b/flutter/examples/flutter_gallery/BUILD.gn index fca749b3ba32f42fa648afc232781cb8b61edb0a..f64277149d455d60161c81fc6cfc5a8b6dfb0d39 100644 --- a/flutter/examples/flutter_gallery/BUILD.gn +++ b/flutter/examples/flutter_gallery/BUILD.gn @@ -41,5 +41,4 @@ flutter_app("flutter_gallery") { "//third_party/dart-pkg/pub/video_player", "//third_party/dart/third_party/pkg/intl", ] - } diff --git a/flutter/packages/flutter/BUILD.gn b/flutter/packages/flutter/BUILD.gn index 6bbb0f3209c7f90b1cb1de125dcc112903a9aa84..5b11e9ccb4b0c86e8db60f9b7d3e6007b44d0065 100644 --- a/flutter/packages/flutter/BUILD.gn +++ b/flutter/packages/flutter/BUILD.gn @@ -13,12 +13,12 @@ dart_library("flutter") { disable_analysis = true deps = [ - "//third_party/dart/third_party/pkg/intl", "//third_party/dart-pkg/pub/async", "//third_party/dart-pkg/pub/collection", "//third_party/dart-pkg/pub/meta", "//third_party/dart-pkg/pub/typed_data", "//third_party/dart-pkg/pub/vector_math", + "//third_party/dart/third_party/pkg/intl", ] if (is_fuchsia) { diff --git a/flutter/packages/flutter_driver/BUILD.gn b/flutter/packages/flutter_driver/BUILD.gn index 818d779c7ca2ba05106ea26f729fc56de7b9cddc..234d9580e2a81ced07a17907e6a774ca35637430 100644 --- a/flutter/packages/flutter_driver/BUILD.gn +++ b/flutter/packages/flutter_driver/BUILD.gn @@ -20,8 +20,8 @@ dart_library("flutter_driver") { "//third_party/dart-pkg/pub/json_rpc_2", "//third_party/dart-pkg/pub/meta", "//third_party/dart-pkg/pub/path", - "//third_party/dart-pkg/pub/web_socket_channel", "//third_party/dart-pkg/pub/vm_service_client", + "//third_party/dart-pkg/pub/web_socket_channel", ] if (is_fuchsia) { diff --git a/flutter/packages/flutter_tools/BUILD.gn b/flutter/packages/flutter_tools/BUILD.gn index 910e06878983db64c364d94a0e764724bbeb1d7d..c1ecfad98859565f2b98f03c8ddb25e7755750dd 100644 --- a/flutter/packages/flutter_tools/BUILD.gn +++ b/flutter/packages/flutter_tools/BUILD.gn @@ -25,6 +25,7 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/crypto", "//third_party/dart-pkg/pub/dwds", "//third_party/dart-pkg/pub/file", + # The HTTP dependency is removed because http doesn't work on Fuchsia # because it uses mirrors which Fuchsia's Dart VM doesn't support. "//third_party/dart-pkg/pub/json_rpc_2", @@ -35,6 +36,7 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/multi_server_socket", "//third_party/dart-pkg/pub/multicast_dns", "//third_party/dart-pkg/pub/mustache", + "//third_party/dart-pkg/pub/node_preamble", "//third_party/dart-pkg/pub/package_config", "//third_party/dart-pkg/pub/path", "//third_party/dart-pkg/pub/platform", @@ -50,7 +52,6 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/webkit_inspection_protocol", "//third_party/dart-pkg/pub/xml", "//third_party/dart-pkg/pub/yaml", - "//third_party/dart-pkg/pub/node_preamble", ] } @@ -59,9 +60,7 @@ dart_tool("fuchsia_builder") { disable_analysis = true - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] } dart_tool("fuchsia_asset_builder") { @@ -147,9 +146,7 @@ dart_tool("fuchsia_asset_builder") { "src/vscode/vscode_validator.dart", ] - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] } dart_tool("fuchsia_tester") { @@ -239,13 +236,9 @@ dart_tool("fuchsia_tester") { "src/vscode/vscode_validator.dart", ] - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] - non_dart_deps = [ - "$flutter_root/shell", - ] + non_dart_deps = [ "$flutter_root/shell" ] } dart_tool("fuchsia_attach") { @@ -257,11 +250,7 @@ dart_tool("fuchsia_attach") { disable_analysis = true - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] - non_dart_deps = [ - "//third_party/flutter/frontend_server:frontend_server_tool_snapshot($host_toolchain)", - ] + non_dart_deps = [ "//third_party/flutter/frontend_server:frontend_server_tool_snapshot($host_toolchain)" ] } diff --git a/flutter_ace_config.gni b/flutter_ace_config.gni index a1c27acdeb59d6bbf96769eefba408a6b8db1d73..f528f5b6244fadf7019f4b0083795edacac116ee 100644 --- a/flutter_ace_config.gni +++ b/flutter_ace_config.gni @@ -18,6 +18,13 @@ use_system_skia = !is_standard_system # Better to change "use_system_skia" to false, otherwise may missing some commands enable_dump_drawcmd = false +use_flutter_icu = true + +aosp_libs_dir = "//prebuilts/aosp_prebuilt_libs/asdk_libs" +libs_root = "${aosp_libs_dir}/sdk" + +ace_root = "//foundation/ace/ace_engine" +ace_flutter_engine_root = "$ace_root/flutter_engine" flutter_root = "//third_party/flutter" ace_wearable_defines = [ "WEARABLE_PRODUCT" ] @@ -41,6 +48,7 @@ use_mac = "${current_os}_${current_cpu}" == "mac_x64" # Toolchain windows_buildtool = "//build/toolchain/mingw:mingw_x86_64" +objcopy_mingw = "//prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/objcopy" mac_buildtool = "//build/toolchain/mac:clang_x64" objcopy_clang = "$clang_base_path/bin/llvm-objcopy" diff --git a/skia/BUILD.gn b/skia/BUILD.gn index b14ab3c7394642378e3b0558b7fd77b5a973d161..b7bf57b6ade8e88f256c5a21e8e4ab3673a449bb 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -359,9 +359,7 @@ optional("fontmgr_android") { optional("fontmgr_custom") { enabled = skia_enable_fontmgr_custom - deps = [ - ":typeface_freetype", - ] + deps = [ ":typeface_freetype" ] sources = [ "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom.h", @@ -375,9 +373,7 @@ optional("fontmgr_custom") { optional("fontmgr_custom_empty") { enabled = skia_enable_fontmgr_custom_empty - deps = [ - ":typeface_freetype", - ] + deps = [ ":typeface_freetype" ] sources = [ "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom_empty.cpp", @@ -387,9 +383,7 @@ optional("fontmgr_custom_empty") { optional("fontmgr_empty") { enabled = skia_enable_fontmgr_empty - sources = [ - "src/ports/SkFontMgr_empty_factory.cpp", - ] + sources = [ "src/ports/SkFontMgr_empty_factory.cpp" ] } optional("fontmgr_fontconfig") { @@ -428,9 +422,7 @@ optional("fontmgr_fuchsia") { optional("fontmgr_wasm") { enabled = !skia_enable_fontmgr_empty && target_cpu == "wasm" - deps = [ - ":typeface_freetype", - ] + deps = [ ":typeface_freetype" ] sources = [ "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom.h", @@ -454,9 +446,7 @@ optional("fontmgr_win") { optional("fontmgr_win_gdi") { enabled = skia_enable_fontmgr_win_gdi - sources = [ - "src/ports/SkFontHost_win.cpp", - ] + sources = [ "src/ports/SkFontHost_win.cpp" ] libs = [ "Gdi32.lib" ] } @@ -473,12 +463,8 @@ if (skia_lex) { action("run_sksllex") { script = "gn/run_sksllex.py" - deps = [ - ":sksllex(//gn/toolchain:$host_toolchain)", - ] - sources = [ - "src/sksl/lex/sksl.lex", - ] + deps = [ ":sksllex(//gn/toolchain:$host_toolchain)" ] + sources = [ "src/sksl/lex/sksl.lex" ] # GN insists its outputs should go somewhere underneath target_out_dir, so we trick it with a # path that starts with target_out_dir and then uses ".." to back up into the src dir. @@ -507,9 +493,7 @@ if (skia_lex) { if (skia_compile_processors) { executable("skslc") { defines = [ "SKSL_STANDALONE" ] - sources = [ - "src/sksl/SkSLMain.cpp", - ] + sources = [ "src/sksl/SkSLMain.cpp" ] sources += skia_sksl_sources sources += skia_sksl_gpu_sources include_dirs = [ "." ] @@ -536,13 +520,9 @@ if (skia_compile_processors) { action("create_sksl_enums") { script = "gn/create_sksl_enums.py" - sources = [ - "include/private/GrSharedEnums.h", - ] - outputs = [ - "$target_out_dir/" + - rebase_path("src/sksl/sksl_enums.inc", target_out_dir), - ] + sources = [ "include/private/GrSharedEnums.h" ] + outputs = [ "$target_out_dir/" + + rebase_path("src/sksl/sksl_enums.inc", target_out_dir) ] args = [ rebase_path(sources[0]), rebase_path(outputs[0]), @@ -698,21 +678,15 @@ optional("heif") { deps = [] - sources = [ - "src/codec/SkHeifCodec.cpp", - ] + sources = [ "src/codec/SkHeifCodec.cpp" ] } optional("jpeg") { enabled = skia_use_libjpeg_turbo public_defines = [ "SK_HAS_JPEG_LIBRARY" ] - deps = [ - "//third_party/libjpeg-turbo:libjpeg", - ] - public = [ - "include/encode/SkJpegEncoder.h", - ] + deps = [ "//third_party/libjpeg-turbo:libjpeg" ] + public = [ "include/encode/SkJpegEncoder.h" ] sources = [ "src/codec/SkJpegCodec.cpp", "src/codec/SkJpegDecoderMgr.cpp", @@ -726,9 +700,7 @@ optional("pdf") { enabled = skia_use_zlib && skia_enable_pdf public_defines = [ "SK_SUPPORT_PDF" ] - deps = [ - "//third_party/zlib", - ] + deps = [ "//third_party/zlib" ] if (skia_use_libjpeg_turbo) { deps += [ ":jpeg" ] } @@ -747,9 +719,7 @@ optional("png") { enabled = skia_use_libpng public_defines = [ "SK_HAS_PNG_LIBRARY" ] - deps = [ - "//third_party/libpng", - ] + deps = [ "//third_party/libpng" ] sources = [ "src/codec/SkIcoCodec.cpp", "src/codec/SkPngCodec.cpp", @@ -771,9 +741,7 @@ optional("raw") { # Skia. configs_to_remove = [ "//gn:no_exceptions" ] - sources = [ - "src/codec/SkRawCodec.cpp", - ] + sources = [ "src/codec/SkRawCodec.cpp" ] } import("third_party/skcms/skcms.gni") @@ -786,9 +754,7 @@ source_set("skcms") { ] } - public = [ - "include/third_party/skcms/skcms.h", - ] + public = [ "include/third_party/skcms/skcms.h" ] include_dirs = [ "include/third_party/skcms" ] sources = rebase_path(skcms_sources, ".", "third_party/skcms") } @@ -796,9 +762,7 @@ source_set("skcms") { optional("typeface_freetype") { enabled = skia_use_freetype - deps = [ - "//third_party/freetype2", - ] + deps = [ "//third_party/freetype2" ] sources = [ "src/ports/SkFontHost_FreeType.cpp", "src/ports/SkFontHost_FreeType_common.cpp", @@ -809,9 +773,7 @@ optional("webp") { enabled = skia_use_libwebp public_defines = [ "SK_HAS_WEBP_LIBRARY" ] - deps = [ - "//third_party/libwebp", - ] + deps = [ "//third_party/libwebp" ] sources = [ "src/codec/SkWebpCodec.cpp", "src/images/SkWebpEncoder.cpp", @@ -822,21 +784,15 @@ optional("wuffs") { enabled = skia_use_wuffs public_defines = [ "SK_HAS_WUFFS_LIBRARY" ] - deps = [ - "//third_party/wuffs", - ] - sources = [ - "src/codec/SkWuffsCodec.cpp", - ] + deps = [ "//third_party/wuffs" ] + sources = [ "src/codec/SkWuffsCodec.cpp" ] } optional("xml") { enabled = skia_use_expat public_defines = [ "SK_XML" ] - deps = [ - "//third_party/expat", - ] + deps = [ "//third_party/expat" ] sources = [ "src/svg/SkSVGCanvas.cpp", "src/svg/SkSVGDevice.cpp", @@ -860,17 +816,13 @@ if (skia_enable_gpu && skia_generate_workarounds) { action("workaround_list") { script = "tools/build_workaround_header.py" - inputs = [ - "src/gpu/gpu_workaround_list.txt", - ] + inputs = [ "src/gpu/gpu_workaround_list.txt" ] # see comments in skia_compile_processors about out dir path shenanigans. output_file = rebase_path("include/gpu/GrDriverBugWorkaroundsAutogen.h", root_out_dir) - outputs = [ - "$root_out_dir/$output_file", - ] + outputs = [ "$root_out_dir/$output_file" ] args = [ "--output-file", "$output_file", @@ -1091,9 +1043,7 @@ if (target_cpu == "wasm") { "tools/debugger/JsonWriteBuffer.cpp", ] - deps = [ - ":fontmgr_wasm", - ] + deps = [ ":fontmgr_wasm" ] } } @@ -1214,9 +1164,7 @@ if (skia_enable_tools) { [ rebase_path(skia_h, root_build_dir) ] + rebase_path(skia_public_includes) depfile = "$skia_h.deps" - outputs = [ - skia_h, - ] + outputs = [ skia_h ] } if (target_cpu == "x64") { @@ -1252,9 +1200,7 @@ if (skia_enable_tools) { } source_set("public_headers_warnings_check") { - sources = [ - "tools/public_headers_warnings_check.cpp", - ] + sources = [ "tools/public_headers_warnings_check.cpp" ] configs -= [ "//gn:warnings_except_public_headers" ] configs += [ ":our_vulkan_headers" ] deps = [ @@ -1298,31 +1244,21 @@ if (skia_enable_tools) { action("${app_name}_generate_info_plist") { script = "//gn/gen_plist_ios.py" - outputs = [ - "$gen_path/${app_name}_Info.plist", - ] + outputs = [ "$gen_path/${app_name}_Info.plist" ] args = [ rebase_path("$gen_path/$app_name", root_build_dir) ] } bundle_data("${app_name}_bundle_info_plist") { - public_deps = [ - ":${app_name}_generate_info_plist", - ] - sources = [ - "$gen_path/${app_name}_Info.plist", - ] - outputs = [ - "{{bundle_root_dir}}/Info.plist", - ] + public_deps = [ ":${app_name}_generate_info_plist" ] + sources = [ "$gen_path/${app_name}_Info.plist" ] + outputs = [ "{{bundle_root_dir}}/Info.plist" ] } has_skps = "True" == exec_script("//gn/checkdir.py", [ rebase_path("skps", root_build_dir) ], "trim string") bundle_data("${app_name}_bundle_resources") { - sources = [ - "resources", - ] + sources = [ "resources" ] outputs = [ # iOS reserves the folders 'Resources' and 'resources' so store one level deeper "{{bundle_resources_dir}}/data/resources", @@ -1330,9 +1266,7 @@ if (skia_enable_tools) { } if (has_skps) { bundle_data("${app_name}_bundle_skps") { - sources = [ - "skps", - ] + sources = [ "skps" ] outputs = [ # Store in same folder as resources "{{bundle_resources_dir}}/data/skps", @@ -1354,28 +1288,16 @@ if (skia_enable_tools) { } bundle_data("${app_name}_bundle_executable") { - public_deps = [ - ":${app_name}_generate_executable", - ] - sources = [ - "$gen_path/$app_name", - ] - outputs = [ - "{{bundle_executable_dir}}/$app_name", - ] + public_deps = [ ":${app_name}_generate_executable" ] + sources = [ "$gen_path/$app_name" ] + outputs = [ "{{bundle_executable_dir}}/$app_name" ] testonly = true } bundle_data("${app_name}_bundle_symbols") { - public_deps = [ - ":${app_name}_generate_executable", - ] - sources = [ - "$gen_path/${app_name}.dSYM", - ] - outputs = [ - "{{bundle_executable_dir}}/${app_name}.dSYM", - ] + public_deps = [ ":${app_name}_generate_executable" ] + sources = [ "$gen_path/${app_name}.dSYM" ] + outputs = [ "{{bundle_executable_dir}}/${app_name}.dSYM" ] testonly = true } @@ -1433,13 +1355,9 @@ if (skia_enable_tools) { if (is_android && skia_android_serial != "" && defined(_executable)) { action("push_" + target_name) { script = "gn/push_to_android.py" - deps = [ - ":" + _executable, - ] + deps = [ ":" + _executable ] _stamp = "$target_gen_dir/$_executable.pushed_$skia_android_serial" - outputs = [ - _stamp, - ] + outputs = [ _stamp ] args = [ rebase_path("$root_build_dir/$_executable"), skia_android_serial, @@ -1555,54 +1473,30 @@ if (skia_enable_tools) { } test_lib("flags") { - sources = [ - "tools/flags/CommandLineFlags.cpp", - ] + sources = [ "tools/flags/CommandLineFlags.cpp" ] } test_lib("common_flags_config") { - sources = [ - "tools/flags/CommonFlagsConfig.cpp", - ] - deps = [ - ":flags", - ] - public_deps = [ - ":gpu_tool_utils", - ] + sources = [ "tools/flags/CommonFlagsConfig.cpp" ] + deps = [ ":flags" ] + public_deps = [ ":gpu_tool_utils" ] } test_lib("common_flags_gpu") { - sources = [ - "tools/flags/CommonFlagsGpu.cpp", - ] - deps = [ - ":flags", - ] - public_deps = [ - ":gpu_tool_utils", - ] + sources = [ "tools/flags/CommonFlagsGpu.cpp" ] + deps = [ ":flags" ] + public_deps = [ ":gpu_tool_utils" ] } test_lib("common_flags_images") { - sources = [ - "tools/flags/CommonFlagsImages.cpp", - ] - deps = [ - ":flags", - ] + sources = [ "tools/flags/CommonFlagsImages.cpp" ] + deps = [ ":flags" ] } test_lib("common_flags_aa") { - sources = [ - "tools/flags/CommonFlagsAA.cpp", - ] - deps = [ - ":flags", - ] + sources = [ "tools/flags/CommonFlagsAA.cpp" ] + deps = [ ":flags" ] } test_lib("trace") { - deps = [ - ":flags", - ] + deps = [ ":flags" ] sources = [ "tools/trace/ChromeTracingTracer.cpp", "tools/trace/ChromeTracingTracer.h", @@ -1669,15 +1563,11 @@ if (skia_enable_tools) { ":experimental_svg_model", ":flags", ] - public_deps = [ - ":gpu_tool_utils", - ] + public_deps = [ ":gpu_tool_utils" ] } test_lib("etc1") { - sources = [ - "third_party/etc1/etc1.cpp", - ] + sources = [ "third_party/etc1/etc1.cpp" ] } if (skia_use_ffmpeg) { @@ -1714,9 +1604,7 @@ if (skia_enable_tools) { sources += [ "gm/fiddle.cpp" ] deps += [ ":skia.h" ] } - public_deps = [ - ":gpu_tool_utils", - ] + public_deps = [ ":gpu_tool_utils" ] if (skia_use_ffmpeg) { deps += [ ":video_decoder" ] @@ -1817,9 +1705,7 @@ if (skia_enable_tools) { "experimental/xform/SkXform.cpp", "experimental/xform/XContext.cpp", ] - deps = [ - ":skia", - ] + deps = [ ":skia" ] } if (skia_use_lua) { @@ -1835,9 +1721,7 @@ if (skia_enable_tools) { } test_app("lua_app") { - sources = [ - "tools/lua/lua_app.cpp", - ] + sources = [ "tools/lua/lua_app.cpp" ] deps = [ ":lua", ":skia", @@ -1846,9 +1730,7 @@ if (skia_enable_tools) { } test_app("lua_pictures") { - sources = [ - "tools/lua/lua_pictures.cpp", - ] + sources = [ "tools/lua/lua_pictures.cpp" ] deps = [ ":flags", ":lua", @@ -1861,28 +1743,20 @@ if (skia_enable_tools) { if (is_linux || is_mac) { test_app("skottie_tool") { - deps = [ - "modules/skottie:tool", - ] + deps = [ "modules/skottie:tool" ] } } test_app("make_skqp_model") { - sources = [ - "tools/skqp/make_skqp_model.cpp", - ] - deps = [ - ":skia", - ] + sources = [ "tools/skqp/make_skqp_model.cpp" ] + deps = [ ":skia" ] } if (target_cpu != "wasm") { import("gn/samples.gni") test_lib("samples") { sources = samples_sources - public_deps = [ - ":tool_utils", - ] + public_deps = [ ":tool_utils" ] deps = [ ":experimental_svg_model", ":flags", @@ -1902,9 +1776,7 @@ if (skia_enable_tools) { } } test_app("imgcvt") { - sources = [ - "tools/imgcvt.cpp", - ] + sources = [ "tools/imgcvt.cpp" ] deps = [ ":skcms", ":skia", @@ -1922,9 +1794,7 @@ if (skia_enable_tools) { ] } test_app("fm") { - sources = [ - "tools/fm/fm.cpp", - ] + sources = [ "tools/fm/fm.cpp" ] deps = [ ":common_flags_aa", ":common_flags_gpu", @@ -1970,19 +1840,13 @@ if (skia_enable_tools) { if (!is_win) { test_app("remote_demo") { - sources = [ - "tools/remote_demo.cpp", - ] - deps = [ - ":skia", - ] + sources = [ "tools/remote_demo.cpp" ] + deps = [ ":skia" ] } } test_app("nanobench") { - sources = [ - "bench/nanobench.cpp", - ] + sources = [ "bench/nanobench.cpp" ] deps = [ ":bench", ":common_flags_aa", @@ -2003,9 +1867,7 @@ if (skia_enable_tools) { } test_app("skpinfo") { - sources = [ - "tools/skpinfo.cpp", - ] + sources = [ "tools/skpinfo.cpp" ] deps = [ ":flags", ":skia", @@ -2014,9 +1876,7 @@ if (skia_enable_tools) { if (skia_use_ffmpeg) { test_app("skottie2movie") { - sources = [ - "tools/skottie2movie.cpp", - ] + sources = [ "tools/skottie2movie.cpp" ] deps = [ ":flags", ":skia", @@ -2028,9 +1888,7 @@ if (skia_enable_tools) { } test_app("skpbench") { - sources = [ - "tools/skpbench/skpbench.cpp", - ] + sources = [ "tools/skpbench/skpbench.cpp" ] deps = [ ":common_flags_config", ":common_flags_gpu", @@ -2042,9 +1900,7 @@ if (skia_enable_tools) { } test_app("sktexttopdf") { - sources = [ - "tools/using_skia_and_harfbuzz.cpp", - ] + sources = [ "tools/using_skia_and_harfbuzz.cpp" ] deps = [ ":skia", "modules/skshaper", @@ -2052,12 +1908,8 @@ if (skia_enable_tools) { } test_app("create_test_font") { - sources = [ - "tools/fonts/create_test_font.cpp", - ] - deps = [ - ":skia", - ] + sources = [ "tools/fonts/create_test_font.cpp" ] + deps = [ ":skia" ] assert_no_deps = [ # tool_utils requires the output of this app. ":tool_utils", @@ -2066,9 +1918,7 @@ if (skia_enable_tools) { if (skia_use_expat) { test_app("create_test_font_color") { - sources = [ - "tools/fonts/create_test_font_color.cpp", - ] + sources = [ "tools/fonts/create_test_font_color.cpp" ] deps = [ ":flags", ":skia", @@ -2078,9 +1928,7 @@ if (skia_enable_tools) { } test_app("get_images_from_skps") { - sources = [ - "tools/get_images_from_skps.cpp", - ] + sources = [ "tools/get_images_from_skps.cpp" ] deps = [ ":flags", ":skia", @@ -2198,9 +2046,7 @@ if (skia_enable_tools) { } test_app("skp_parser") { - sources = [ - "tools/skp_parser.cpp", - ] + sources = [ "tools/skp_parser.cpp" ] deps = [ ":skia", ":tool_utils", @@ -2225,9 +2071,7 @@ if (skia_enable_tools) { ] } test_app("skqp") { - sources = [ - "tools/skqp/src/skqp_main.cpp", - ] + sources = [ "tools/skqp/src/skqp_main.cpp" ] deps = [ ":skia", ":skqp_lib", @@ -2235,9 +2079,7 @@ if (skia_enable_tools) { ] } test_app("jitter_gms") { - sources = [ - "tools/skqp/jitter_gms.cpp", - ] + sources = [ "tools/skqp/jitter_gms.cpp" ] deps = [ ":gm", ":skia", @@ -2248,9 +2090,7 @@ if (skia_enable_tools) { if (is_android) { test_app("skqp_app") { is_shared_library = true - sources = [ - "tools/skqp/src/jni_skqp.cpp", - ] + sources = [ "tools/skqp/src/jni_skqp.cpp" ] deps = [ ":skia", ":skqp_lib", @@ -2278,9 +2118,7 @@ if (skia_enable_tools) { } test_app("list_gms") { - sources = [ - "tools/list_gms.cpp", - ] + sources = [ "tools/list_gms.cpp" ] deps = [ ":gm", ":skia", @@ -2405,9 +2243,7 @@ if (skia_enable_tools) { libs += [ "MetalKit.framework" ] } - deps = [ - ":tool_utils", - ] + deps = [ ":tool_utils" ] if (is_android) { deps += [ "//third_party/native_app_glue" ] } else if (is_ios) { @@ -2483,9 +2319,7 @@ if (skia_enable_tools) { if (!skia_use_angle && (is_linux || is_win || is_mac)) { test_app("HelloWorld") { - sources = [ - "example/HelloWorld.cpp", - ] + sources = [ "example/HelloWorld.cpp" ] libs = [] deps = [ @@ -2500,9 +2334,7 @@ if (skia_enable_tools) { if (is_linux || is_mac || is_ios) { test_app("SkiaSDLExample") { - sources = [ - "example/SkiaSDLExample.cpp", - ] + sources = [ "example/SkiaSDLExample.cpp" ] libs = [] deps = [ ":gpu_tool_utils", @@ -2515,12 +2347,8 @@ if (skia_enable_tools) { if (skia_qt_path != "" && (is_win || is_linux || is_mac)) { action_foreach("generate_mocs") { script = "gn/call.py" - sources = [ - "tools/mdbviz/MainWindow.h", - ] - outputs = [ - "$target_gen_dir/mdbviz/{{source_name_part}}_moc.cpp", - ] + sources = [ "tools/mdbviz/MainWindow.h" ] + outputs = [ "$target_gen_dir/mdbviz/{{source_name_part}}_moc.cpp" ] args = [ "$skia_qt_path" + "/bin/moc", "{{source}}", @@ -2530,12 +2358,8 @@ if (skia_enable_tools) { } action_foreach("generate_resources") { script = "gn/call.py" - sources = [ - "tools/mdbviz/resources.qrc", - ] - outputs = [ - "$target_gen_dir/mdbviz/{{source_name_part}}_res.cpp", - ] + sources = [ "tools/mdbviz/resources.qrc" ] + outputs = [ "$target_gen_dir/mdbviz/{{source_name_part}}_res.cpp" ] args = [ "$skia_qt_path" + "/bin/rcc", "{{source}}", @@ -2582,30 +2406,20 @@ if (skia_enable_tools) { if (is_android && defined(ndk) && ndk != "") { copy("gdbserver") { - sources = [ - "$ndk/$ndk_gdbserver", - ] - outputs = [ - "$root_out_dir/gdbserver", - ] + sources = [ "$ndk/$ndk_gdbserver" ] + outputs = [ "$root_out_dir/gdbserver" ] } } if (skia_use_opencl) { test_app("hello-opencl") { - sources = [ - "tools/hello-opencl.cpp", - ] - deps = [ - "//third_party/opencl", - ] + sources = [ "tools/hello-opencl.cpp" ] + deps = [ "//third_party/opencl" ] } } executable("cpu_modules") { - sources = [ - "tools/cpu_modules.cpp", - ] + sources = [ "tools/cpu_modules.cpp" ] deps = [ ":skia", "modules/particles", @@ -2615,9 +2429,7 @@ if (skia_enable_tools) { if (skia_use_icu && skia_use_harfbuzz) { test_app("editor") { is_shared_library = is_android - deps = [ - "experimental/editor:editor_app", - ] + deps = [ "experimental/editor:editor_app" ] } } diff --git a/skia/experimental/editor/BUILD.gn b/skia/experimental/editor/BUILD.gn index aeac20ef762a74e040ca0f980c4cd0e3bf4778c5..cab388f53c0fca6d076bd7cf80dbc97f8fde2d1a 100644 --- a/skia/experimental/editor/BUILD.gn +++ b/skia/experimental/editor/BUILD.gn @@ -16,25 +16,15 @@ if (skia_use_icu && skia_use_harfbuzz) { "editor.cpp", "stringslice.cpp", ] - public_deps = [ - "../..:skia", - ] - deps = [ - ":shape", - ] + public_deps = [ "../..:skia" ] + deps = [ ":shape" ] } source_set("shape") { include_dirs = [ "../.." ] - public = [ - "shape.h", - ] - sources = [ - "shape.cpp", - ] - public_deps = [ - "../..:skia", - ] + public = [ "shape.h" ] + sources = [ "shape.cpp" ] + public_deps = [ "../..:skia" ] deps = [ ":word_boundaries", "../../modules/skshaper", @@ -43,27 +33,15 @@ if (skia_use_icu && skia_use_harfbuzz) { source_set("word_boundaries") { include_dirs = [ "../.." ] - public = [ - "word_boundaries.h", - ] - sources = [ - "word_boundaries.cpp", - ] - deps = [ - "../../third_party/icu", - ] + public = [ "word_boundaries.h" ] + sources = [ "word_boundaries.cpp" ] + deps = [ "../../third_party/icu" ] } source_set("editor_app") { testonly = true - sources = [ - "editor_application.cpp", - ] - public_deps = [ - "../..:sk_app", - ] - deps = [ - ":editor_lib", - ] + sources = [ "editor_application.cpp" ] + public_deps = [ "../..:sk_app" ] + deps = [ ":editor_lib" ] } } diff --git a/skia/experimental/svg/model/SkSVGXMLDOM.cpp b/skia/experimental/svg/model/SkSVGXMLDOM.cpp index 5205e75546591b9aa7bc91fd16ac928031d9c9ea..95603d8565814133b34a1af00898110a32c2baea 100644 --- a/skia/experimental/svg/model/SkSVGXMLDOM.cpp +++ b/skia/experimental/svg/model/SkSVGXMLDOM.cpp @@ -53,7 +53,7 @@ protected: bool setSVGColorAndOpacity( SkDOM::Attr* attr, const char name[], const char value[], const SkColorEx& svgThemeColor) { if (svgThemeColor.valid && (((strcmp(name, "fill") == 0) && (strcmp(value, "none") != 0)) || - ((strcmp(name, "stroke") == 0) && (strcmp(value, "none") != 0)))) { + ((strcmp(name, "stroke") == 0) && (strcmp(value, "none") != 0))) && isPureColor(value)) { char colorBuffer[8]; int res = snprintf(colorBuffer, sizeof(colorBuffer), "#%06x", (svgThemeColor.color & 0xFFFFFF)); attr->fValue = dupstr(fAlloc, (res < 0) ? value : colorBuffer); @@ -122,11 +122,29 @@ protected: return false; } + bool isPureColor(const char value[]) const { + std::string color(value); + if (color.empty()) { + return true; + } + + auto pos = color.find_first_not_of(' '); + if (pos != std::string::npos) { + color = color.substr(pos); + } + + if (color.length() > urlLength && color.substr(0, urlLength - 1) == "url(#") { + return false; + } + return true; + } + private: // for parse css style svg files. bool fProcessingStyle = false; CssStyleParser fStyleParser; uint64_t fSvgThemeColor = 0; + static const int urlLength = 6; }; diff --git a/skia/gn/BUILD.gn b/skia/gn/BUILD.gn index 8947d99c1147739d0934c70375f0c0f718b721bc..312a97a161c451e96c5409a0d985f55dfc4561b0 100644 --- a/skia/gn/BUILD.gn +++ b/skia/gn/BUILD.gn @@ -262,15 +262,19 @@ config("warnings") { # Disable a bunch of warnings: "/wd4244", # conversion from 'float' to 'int', possible loss of data "/wd4267", # conversion from 'size_t' to 'int', possible loss of data - "/wd4800", # forcing value to bool 'true' or 'false' (performance warning) + "/wd4800", # forcing value to bool 'true' or 'false' (performance + # warning) # Probably only triggers when /EHsc is enabled. "/wd4291", # no matching operator delete found; - # memory will not be freed if initialization throws an exception + # memory will not be freed if initialization throws an + # exception # These only show up in shared builds: - "/wd4251", # class 'type' needs to have dll-interface to be used by clients of class 'type2' - "/wd4275", # non dll-interface class 'base' used as base for dll-interface class 'derived' + "/wd4251", # class 'type' needs to have dll-interface to be used by + # clients of class 'type2' + "/wd4275", # non dll-interface class 'base' used as base for + # dll-interface class 'derived' ] } else { cflags += [ @@ -294,7 +298,8 @@ config("warnings") { cflags += [ "-fcolor-diagnostics", "-Weverything", - "-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' warnings. + "-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' + # warnings. ] if (target_cpu == "arm" && is_ios) { @@ -485,7 +490,8 @@ config("executable") { } else if (is_win) { ldflags = [ "/SUBSYSTEM:CONSOLE", # Quiet "no subsystem specified; CONSOLE assumed". - "/INCREMENTAL:NO", # Quiet warnings about failing to incrementally link by never trying to. + "/INCREMENTAL:NO", # Quiet warnings about failing to incrementally link + # by never trying to. ] } } diff --git a/skia/gn/bench.gni b/skia/gn/bench.gni index f2d8803cb71222b29fa3d3af141736f6d0c465e0..ad1429b8013e99fbb91bf8fbfa01c83d1fe17a4c 100644 --- a/skia/gn/bench.gni +++ b/skia/gn/bench.gni @@ -42,16 +42,16 @@ bench_sources = [ "$_bench/DrawBitmapAABench.cpp", "$_bench/DrawLatticeBench.cpp", "$_bench/EncodeBench.cpp", - "$_bench/FontCacheBench.cpp", "$_bench/FSRectBench.cpp", + "$_bench/FontCacheBench.cpp", + "$_bench/GMBench.cpp", "$_bench/GameBench.cpp", "$_bench/GeometryBench.cpp", - "$_bench/GMBench.cpp", - "$_bench/GradientBench.cpp", "$_bench/GrCCFillGeometryBench.cpp", "$_bench/GrMemoryPoolBench.cpp", "$_bench/GrMipMapBench.cpp", "$_bench/GrResourceCacheBench.cpp", + "$_bench/GradientBench.cpp", "$_bench/HairlinePathBench.cpp", "$_bench/HardStopGradientBench_ScaleNumColors.cpp", "$_bench/HardStopGradientBench_ScaleNumHardStops.cpp", @@ -76,12 +76,12 @@ bench_sources = [ "$_bench/MipMapBench.cpp", "$_bench/MorphologyBench.cpp", "$_bench/MutexBench.cpp", + "$_bench/PDFBench.cpp", "$_bench/PatchBench.cpp", "$_bench/PathBench.cpp", "$_bench/PathIterBench.cpp", "$_bench/PathOpsBench.cpp", "$_bench/PathTextBench.cpp", - "$_bench/PDFBench.cpp", "$_bench/PerlinNoiseBench.cpp", "$_bench/PictureNestingBench.cpp", "$_bench/PictureOverheadBench.cpp", @@ -89,29 +89,29 @@ bench_sources = [ "$_bench/PolyUtilsBench.cpp", "$_bench/PremulAndUnpremulAlphaOpsBench.cpp", "$_bench/QuickRejectBench.cpp", + "$_bench/RTreeBench.cpp", "$_bench/ReadPixBench.cpp", "$_bench/RecordingBench.cpp", - "$_bench/RectanizerBench.cpp", "$_bench/RectBench.cpp", + "$_bench/RectanizerBench.cpp", "$_bench/RefCntBench.cpp", "$_bench/RegionBench.cpp", "$_bench/RegionContainBench.cpp", "$_bench/RepeatTileBench.cpp", "$_bench/RotatedRectBench.cpp", - "$_bench/RTreeBench.cpp", + "$_bench/SKPAnimationBench.cpp", + "$_bench/SKPBench.cpp", "$_bench/ScalarBench.cpp", "$_bench/ShaderMaskFilterBench.cpp", "$_bench/ShadowBench.cpp", "$_bench/ShapesBench.cpp", "$_bench/Sk4fBench.cpp", "$_bench/SkGlyphCacheBench.cpp", - "$_bench/SKPAnimationBench.cpp", - "$_bench/SkVMBench.cpp", - "$_bench/SKPBench.cpp", "$_bench/SkSLBench.cpp", "$_bench/SkSLInterpreterBench.cpp", - "$_bench/StreamBench.cpp", + "$_bench/SkVMBench.cpp", "$_bench/SortBench.cpp", + "$_bench/StreamBench.cpp", "$_bench/StrokeBench.cpp", "$_bench/SwizzleBench.cpp", "$_bench/TableBench.cpp", diff --git a/skia/gn/core.gni b/skia/gn/core.gni index 21c302b186b914eaca473268c55f9fce7b40ede8..cc4e726814dd1bc97247921f98141c01786743d8 100644 --- a/skia/gn/core.gni +++ b/skia/gn/core.gni @@ -102,17 +102,20 @@ skia_core_sources = [ "$_src/c/sk_paint.cpp", "$_src/c/sk_surface.cpp", "$_src/c/sk_types_priv.h", - "$_src/core/Sk4px.h", "$_src/core/SkAAClip.cpp", - "$_src/core/SkAnnotation.cpp", + "$_src/core/SkATrace.cpp", + "$_src/core/SkATrace.h", "$_src/core/SkAdvancedTypefaceMetrics.h", "$_src/core/SkAlphaRuns.cpp", + "$_src/core/SkAnalyticEdge.cpp", + "$_src/core/SkAnnotation.cpp", "$_src/core/SkAntiRun.h", - "$_src/core/SkATrace.cpp", - "$_src/core/SkATrace.h", - "$_src/core/SkAutoPixmapStorage.h", + "$_src/core/SkArenaAlloc.cpp", + "$_src/core/SkArenaAlloc.h", + "$_src/core/SkArenaAllocList.h", "$_src/core/SkAutoPixmapStorage.cpp", + "$_src/core/SkAutoPixmapStorage.h", "$_src/core/SkBBHFactory.cpp", "$_src/core/SkBBoxHierarchy.h", "$_src/core/SkBitmap.cpp", @@ -127,15 +130,15 @@ skia_core_sources = [ "$_src/core/SkBlitBWMaskTemplate.h", "$_src/core/SkBlitRow.h", "$_src/core/SkBlitRow_D32.cpp", - "$_src/core/SkBlitter.h", "$_src/core/SkBlitter.cpp", + "$_src/core/SkBlitter.h", "$_src/core/SkBlitter_A8.cpp", "$_src/core/SkBlitter_ARGB32.cpp", "$_src/core/SkBlitter_RGB565.cpp", "$_src/core/SkBlitter_Sprite.cpp", + "$_src/core/SkBlurMF.cpp", "$_src/core/SkBlurMask.cpp", "$_src/core/SkBlurMask.h", - "$_src/core/SkBlurMF.cpp", "$_src/core/SkBuffer.cpp", "$_src/core/SkCachedData.cpp", "$_src/core/SkCanvas.cpp", @@ -163,8 +166,8 @@ skia_core_sources = [ "$_src/core/SkData.cpp", "$_src/core/SkDataTable.cpp", "$_src/core/SkDebug.cpp", - "$_src/core/SkDeferredDisplayListPriv.h", "$_src/core/SkDeferredDisplayList.cpp", + "$_src/core/SkDeferredDisplayListPriv.h", "$_src/core/SkDeferredDisplayListRecorder.cpp", "$_src/core/SkDeque.cpp", "$_src/core/SkDescriptor.cpp", @@ -172,65 +175,62 @@ skia_core_sources = [ "$_src/core/SkDevice.cpp", "$_src/core/SkDevice.h", "$_src/core/SkDiscardableMemory.h", - "$_src/lazy/SkDiscardableMemoryPool.cpp", "$_src/core/SkDistanceFieldGen.cpp", "$_src/core/SkDistanceFieldGen.h", "$_src/core/SkDocument.cpp", "$_src/core/SkDraw.cpp", - "$_src/core/SkDraw_atlas.cpp", - "$_src/core/SkDraw_text.cpp", - "$_src/core/SkDraw_vertices.cpp", "$_src/core/SkDraw.h", - "$_src/core/SkDrawable.cpp", "$_src/core/SkDrawLooper.cpp", "$_src/core/SkDrawProcs.h", "$_src/core/SkDrawShadowInfo.cpp", "$_src/core/SkDrawShadowInfo.h", + "$_src/core/SkDraw_atlas.cpp", + "$_src/core/SkDraw_text.cpp", + "$_src/core/SkDraw_vertices.cpp", + "$_src/core/SkDrawable.cpp", + "$_src/core/SkEdge.cpp", + "$_src/core/SkEdge.h", "$_src/core/SkEdgeBuilder.cpp", "$_src/core/SkEdgeBuilder.h", "$_src/core/SkEdgeClipper.cpp", "$_src/core/SkEdgeClipper.h", "$_src/core/SkEndian.h", "$_src/core/SkExecutor.cpp", - "$_src/core/SkAnalyticEdge.cpp", - "$_src/core/SkEdge.cpp", - "$_src/core/SkEdge.h", "$_src/core/SkFDot6.h", - "$_src/core/SkArenaAlloc.cpp", - "$_src/core/SkArenaAlloc.h", - "$_src/core/SkArenaAllocList.h", - "$_src/core/SkGaussFilter.cpp", - "$_src/core/SkGaussFilter.h", "$_src/core/SkFlattenable.cpp", "$_src/core/SkFont.cpp", - "$_src/core/SkFontLCDConfig.cpp", - "$_src/core/SkFontMgr.cpp", "$_src/core/SkFontDescriptor.cpp", "$_src/core/SkFontDescriptor.h", + "$_src/core/SkFontLCDConfig.cpp", + "$_src/core/SkFontMgr.cpp", "$_src/core/SkFontStream.cpp", "$_src/core/SkFontStream.h", "$_src/core/SkFuzzLogging.h", + "$_src/core/SkGaussFilter.cpp", + "$_src/core/SkGaussFilter.h", "$_src/core/SkGeometry.cpp", "$_src/core/SkGeometry.h", "$_src/core/SkGlobalInitialization_core.cpp", - "$_src/core/SkGlyph.h", "$_src/core/SkGlyph.cpp", + "$_src/core/SkGlyph.h", "$_src/core/SkGlyphRun.cpp", "$_src/core/SkGlyphRun.h", "$_src/core/SkGlyphRunPainter.cpp", "$_src/core/SkGlyphRunPainter.h", - "$_src/core/SkGpuBlurUtils.h", "$_src/core/SkGpuBlurUtils.cpp", + "$_src/core/SkGpuBlurUtils.h", "$_src/core/SkGraphics.cpp", "$_src/core/SkHalf.cpp", "$_src/core/SkICC.cpp", "$_src/core/SkImageFilter.cpp", - "$_src/core/SkImageFilter_Base.h", "$_src/core/SkImageFilterCache.cpp", "$_src/core/SkImageFilterCache.h", "$_src/core/SkImageFilterTypes.h", - "$_src/core/SkImageInfo.cpp", + "$_src/core/SkImageFilter_Base.h", "$_src/core/SkImageGenerator.cpp", + "$_src/core/SkImageInfo.cpp", + "$_src/core/SkLatticeIter.cpp", + "$_src/core/SkLatticeIter.h", "$_src/core/SkLineClipper.cpp", "$_src/core/SkLocalMatrixImageFilter.cpp", "$_src/core/SkLocalMatrixImageFilter.h", @@ -240,8 +240,8 @@ skia_core_sources = [ "$_src/core/SkMallocPixelRef.cpp", "$_src/core/SkMask.cpp", "$_src/core/SkMask.h", - "$_src/core/SkMaskBlurFilter.h", "$_src/core/SkMaskBlurFilter.cpp", + "$_src/core/SkMaskBlurFilter.h", "$_src/core/SkMaskCache.cpp", "$_src/core/SkMaskFilter.cpp", "$_src/core/SkMaskGamma.cpp", @@ -254,35 +254,33 @@ skia_core_sources = [ "$_src/core/SkMatrixImageFilter.h", "$_src/core/SkMatrixUtils.h", "$_src/core/SkMessageBus.h", - "$_src/core/SkMipMap.cpp", - "$_src/core/SkMipMap.h", "$_src/core/SkMiniRecorder.cpp", "$_src/core/SkMiniRecorder.h", + "$_src/core/SkMipMap.cpp", + "$_src/core/SkMipMap.h", "$_src/core/SkModeColorFilter.cpp", "$_src/core/SkNextID.h", - "$_src/core/SkLatticeIter.cpp", - "$_src/core/SkLatticeIter.h", "$_src/core/SkNormalFlatSource.cpp", "$_src/core/SkNormalFlatSource.h", "$_src/core/SkNormalMapSource.cpp", "$_src/core/SkNormalMapSource.h", "$_src/core/SkNormalSource.cpp", "$_src/core/SkNormalSource.h", + "$_src/core/SkOSFile.h", "$_src/core/SkOpts.cpp", "$_src/core/SkOpts.h", "$_src/core/SkOrderedReadBuffer.h", - "$_src/core/SkOSFile.h", "$_src/core/SkOverdrawCanvas.cpp", "$_src/core/SkPaint.cpp", "$_src/core/SkPaintDefaults.h", "$_src/core/SkPaintPriv.cpp", "$_src/core/SkPaintPriv.h", "$_src/core/SkPath.cpp", - "$_src/core/SkPath_serial.cpp", "$_src/core/SkPathEffect.cpp", "$_src/core/SkPathMeasure.cpp", "$_src/core/SkPathPriv.h", "$_src/core/SkPathRef.cpp", + "$_src/core/SkPath_serial.cpp", "$_src/core/SkPixelRef.cpp", "$_src/core/SkPixmap.cpp", "$_src/core/SkPoint.cpp", @@ -291,35 +289,35 @@ skia_core_sources = [ "$_src/core/SkPtrRecorder.cpp", "$_src/core/SkQuadClipper.cpp", "$_src/core/SkQuadClipper.h", + "$_src/core/SkRRect.cpp", + "$_src/core/SkRRectPriv.h", + "$_src/core/SkRTree.cpp", + "$_src/core/SkRTree.h", + "$_src/core/SkRWBuffer.cpp", "$_src/core/SkRasterClip.cpp", "$_src/core/SkRasterPipeline.cpp", "$_src/core/SkRasterPipelineBlitter.cpp", - "$_src/core/SkReadBuffer.h", "$_src/core/SkReadBuffer.cpp", + "$_src/core/SkReadBuffer.h", "$_src/core/SkReader32.h", "$_src/core/SkRecord.cpp", - "$_src/core/SkRecords.cpp", - "$_src/core/SkRecords.h", "$_src/core/SkRecordDraw.cpp", "$_src/core/SkRecordOpts.cpp", "$_src/core/SkRecordOpts.h", "$_src/core/SkRecordPattern.h", + "$_src/core/SkRecords.cpp", + "$_src/core/SkRecords.h", "$_src/core/SkRect.cpp", "$_src/core/SkRegion.cpp", "$_src/core/SkRegionPriv.h", "$_src/core/SkRegion_path.cpp", - "$_src/core/SkRemoteGlyphCache.h", "$_src/core/SkRemoteGlyphCache.cpp", + "$_src/core/SkRemoteGlyphCache.h", "$_src/core/SkResourceCache.cpp", - "$_src/core/SkRRect.cpp", - "$_src/core/SkRRectPriv.h", - "$_src/core/SkRTree.h", - "$_src/core/SkRTree.cpp", - "$_src/core/SkRWBuffer.cpp", "$_src/core/SkScalar.cpp", + "$_src/core/SkScaleToSides.h", "$_src/core/SkScalerContext.cpp", "$_src/core/SkScalerContext.h", - "$_src/core/SkScaleToSides.h", "$_src/core/SkScan.cpp", "$_src/core/SkScan.h", "$_src/core/SkScanPriv.h", @@ -338,9 +336,9 @@ skia_core_sources = [ "$_src/core/SkSpecialSurface.cpp", "$_src/core/SkSpecialSurface.h", "$_src/core/SkSpinlock.cpp", + "$_src/core/SkSpriteBlitter.h", "$_src/core/SkSpriteBlitter_ARGB32.cpp", "$_src/core/SkSpriteBlitter_RGB565.cpp", - "$_src/core/SkSpriteBlitter.h", "$_src/core/SkStream.cpp", "$_src/core/SkStreamPriv.h", "$_src/core/SkStrike.cpp", @@ -352,40 +350,40 @@ skia_core_sources = [ "$_src/core/SkStrikeSpec.h", "$_src/core/SkString.cpp", "$_src/core/SkStringUtils.cpp", - "$_src/core/SkStroke.h", "$_src/core/SkStroke.cpp", + "$_src/core/SkStroke.h", "$_src/core/SkStrokeRec.cpp", "$_src/core/SkStrokerPriv.cpp", "$_src/core/SkStrokerPriv.h", "$_src/core/SkSurfaceCharacterization.cpp", "$_src/core/SkSurfacePriv.h", "$_src/core/SkSwizzle.cpp", - "$_src/core/SkTaskGroup.cpp", - "$_src/core/SkTaskGroup.h", "$_src/core/SkTDPQueue.h", "$_src/core/SkTDynamicHash.h", - "$_src/core/SkTextBlob.cpp", - "$_src/core/SkTextBlobPriv.h", - "$_src/core/SkTextFormatParams.h", - "$_src/core/SkTime.cpp", "$_src/core/SkTInternalLList.h", - "$_src/core/SkThreadID.cpp", - "$_src/core/SkTLazy.h", "$_src/core/SkTLList.h", "$_src/core/SkTLS.cpp", + "$_src/core/SkTLazy.h", "$_src/core/SkTMultiMap.h", - "$_src/core/SkTraceEvent.h", - "$_src/core/SkTraceEventCommon.h", "$_src/core/SkTSearch.cpp", "$_src/core/SkTSearch.h", "$_src/core/SkTSort.h", "$_src/core/SkTTopoSort.h", + "$_src/core/SkTaskGroup.cpp", + "$_src/core/SkTaskGroup.h", + "$_src/core/SkTextBlob.cpp", + "$_src/core/SkTextBlobPriv.h", + "$_src/core/SkTextFormatParams.h", + "$_src/core/SkThreadID.cpp", + "$_src/core/SkTime.cpp", + "$_src/core/SkTraceEvent.h", + "$_src/core/SkTraceEventCommon.h", "$_src/core/SkTypeface.cpp", - "$_src/core/SkTypeface_remote.h", - "$_src/core/SkTypeface_remote.cpp", "$_src/core/SkTypefaceCache.cpp", "$_src/core/SkTypefaceCache.h", "$_src/core/SkTypefacePriv.h", + "$_src/core/SkTypeface_remote.cpp", + "$_src/core/SkTypeface_remote.h", "$_src/core/SkUnPreMultiply.cpp", "$_src/core/SkUtils.cpp", "$_src/core/SkUtils.h", @@ -393,20 +391,20 @@ skia_core_sources = [ "$_src/core/SkVM.h", "$_src/core/SkVMBlitter.cpp", "$_src/core/SkValidationUtils.h", - "$_src/core/SkVertices.cpp", "$_src/core/SkVertState.cpp", + "$_src/core/SkVertices.cpp", "$_src/core/SkWriteBuffer.cpp", "$_src/core/SkWriter32.cpp", "$_src/core/SkWriter32.h", "$_src/core/SkXfermode.cpp", "$_src/core/SkXfermodeInterpretation.cpp", "$_src/core/SkXfermodeInterpretation.h", - "$_src/core/SkYUVPlanesCache.cpp", - "$_src/core/SkYUVPlanesCache.h", "$_src/core/SkYUVASizeInfo.cpp", "$_src/core/SkYUVMath.cpp", - + "$_src/core/SkYUVPlanesCache.cpp", + "$_src/core/SkYUVPlanesCache.h", "$_src/image/SkImage.cpp", + "$_src/lazy/SkDiscardableMemoryPool.cpp", # "$_src/image/SkImage_Gpu.cpp", "$_src/image/SkImage_Lazy.cpp", @@ -417,7 +415,13 @@ skia_core_sources = [ # "$_src/image/SkSurface_Gpu.cpp", "$_src/image/SkSurface_Raster.cpp", - + "$_src/opts/SkBlitMask_opts.h", + "$_src/opts/SkBlitRow_opts.h", + "$_src/opts/SkChecksum_opts.h", + "$_src/opts/SkRasterPipeline_opts.h", + "$_src/opts/SkSwizzler_opts.h", + "$_src/opts/SkUtils_opts.h", + "$_src/opts/SkXfermode_opts.h", "$_src/shaders/SkBitmapProcShader.cpp", "$_src/shaders/SkBitmapProcShader.h", "$_src/shaders/SkColorFilterShader.cpp", @@ -439,14 +443,6 @@ skia_core_sources = [ "$_src/shaders/SkShader.cpp", "$_src/shaders/SkShaderBase.h", - "$_src/opts/SkBlitMask_opts.h", - "$_src/opts/SkBlitRow_opts.h", - "$_src/opts/SkChecksum_opts.h", - "$_src/opts/SkRasterPipeline_opts.h", - "$_src/opts/SkSwizzler_opts.h", - "$_src/opts/SkUtils_opts.h", - "$_src/opts/SkXfermode_opts.h", - # private "$_include/private/SkChecksum.h", "$_include/private/SkDeferredDisplayList.h", @@ -465,14 +461,14 @@ skia_core_sources = [ "$_include/private/SkSemaphore.h", "$_include/private/SkShadowFlags.h", "$_include/private/SkSpinlock.h", - "$_include/private/SkTemplates.h", "$_include/private/SkTArray.h", "$_include/private/SkTDArray.h", "$_include/private/SkTFitsIn.h", "$_include/private/SkTHash.h", + "$_include/private/SkTLogic.h", + "$_include/private/SkTemplates.h", "$_include/private/SkThreadAnnotations.h", "$_include/private/SkThreadID.h", - "$_include/private/SkTLogic.h", "$_include/private/SkWeakRefCnt.h", ] @@ -480,61 +476,60 @@ skia_pathops_public = [ "$_include/pathops/SkPathOps.h" ] skia_pathops_sources = [ "$_src/pathops/SkAddIntersections.cpp", + "$_src/pathops/SkAddIntersections.h", "$_src/pathops/SkDConicLineIntersection.cpp", "$_src/pathops/SkDCubicLineIntersection.cpp", "$_src/pathops/SkDCubicToQuads.cpp", "$_src/pathops/SkDLineIntersection.cpp", "$_src/pathops/SkDQuadLineIntersection.cpp", + "$_src/pathops/SkIntersectionHelper.h", "$_src/pathops/SkIntersections.cpp", + "$_src/pathops/SkIntersections.h", + "$_src/pathops/SkLineParameters.h", "$_src/pathops/SkOpAngle.cpp", + "$_src/pathops/SkOpAngle.h", "$_src/pathops/SkOpBuilder.cpp", "$_src/pathops/SkOpCoincidence.cpp", + "$_src/pathops/SkOpCoincidence.h", "$_src/pathops/SkOpContour.cpp", + "$_src/pathops/SkOpContour.h", "$_src/pathops/SkOpCubicHull.cpp", "$_src/pathops/SkOpEdgeBuilder.cpp", + "$_src/pathops/SkOpEdgeBuilder.h", "$_src/pathops/SkOpSegment.cpp", + "$_src/pathops/SkOpSegment.h", "$_src/pathops/SkOpSpan.cpp", + "$_src/pathops/SkOpSpan.h", "$_src/pathops/SkPathOpsAsWinding.cpp", + "$_src/pathops/SkPathOpsBounds.h", "$_src/pathops/SkPathOpsCommon.cpp", + "$_src/pathops/SkPathOpsCommon.h", "$_src/pathops/SkPathOpsConic.cpp", + "$_src/pathops/SkPathOpsConic.h", "$_src/pathops/SkPathOpsCubic.cpp", + "$_src/pathops/SkPathOpsCubic.h", "$_src/pathops/SkPathOpsCurve.cpp", + "$_src/pathops/SkPathOpsCurve.h", "$_src/pathops/SkPathOpsDebug.cpp", + "$_src/pathops/SkPathOpsDebug.h", "$_src/pathops/SkPathOpsLine.cpp", + "$_src/pathops/SkPathOpsLine.h", "$_src/pathops/SkPathOpsOp.cpp", + "$_src/pathops/SkPathOpsPoint.h", "$_src/pathops/SkPathOpsQuad.cpp", + "$_src/pathops/SkPathOpsQuad.h", "$_src/pathops/SkPathOpsRect.cpp", + "$_src/pathops/SkPathOpsRect.h", "$_src/pathops/SkPathOpsSimplify.cpp", "$_src/pathops/SkPathOpsTSect.cpp", + "$_src/pathops/SkPathOpsTSect.h", "$_src/pathops/SkPathOpsTightBounds.cpp", "$_src/pathops/SkPathOpsTypes.cpp", + "$_src/pathops/SkPathOpsTypes.h", "$_src/pathops/SkPathOpsWinding.cpp", "$_src/pathops/SkPathWriter.cpp", - "$_src/pathops/SkReduceOrder.cpp", - - "$_src/pathops/SkAddIntersections.h", - "$_src/pathops/SkIntersectionHelper.h", - "$_src/pathops/SkIntersections.h", - "$_src/pathops/SkLineParameters.h", - "$_src/pathops/SkOpAngle.h", - "$_src/pathops/SkOpCoincidence.h", - "$_src/pathops/SkOpContour.h", - "$_src/pathops/SkOpEdgeBuilder.h", - "$_src/pathops/SkOpSegment.h", - "$_src/pathops/SkOpSpan.h", - "$_src/pathops/SkPathOpsBounds.h", - "$_src/pathops/SkPathOpsCommon.h", - "$_src/pathops/SkPathOpsConic.h", - "$_src/pathops/SkPathOpsCubic.h", - "$_src/pathops/SkPathOpsCurve.h", - "$_src/pathops/SkPathOpsDebug.h", - "$_src/pathops/SkPathOpsLine.h", - "$_src/pathops/SkPathOpsPoint.h", - "$_src/pathops/SkPathOpsQuad.h", - "$_src/pathops/SkPathOpsRect.h", - "$_src/pathops/SkPathOpsTSect.h", - "$_src/pathops/SkPathOpsTypes.h", "$_src/pathops/SkPathWriter.h", + "$_src/pathops/SkReduceOrder.cpp", "$_src/pathops/SkReduceOrder.h", ] diff --git a/skia/gn/effects.gni b/skia/gn/effects.gni index 2be671e88be41934074a21a24518ccac8d967a5e..cb94bc75aeb40d8dfe384bcf4c835d3a36e45efe 100644 --- a/skia/gn/effects.gni +++ b/skia/gn/effects.gni @@ -29,7 +29,6 @@ skia_effects_public = [ skia_effects_sources = [ "$_src/c/sk_effects.cpp", - "$_src/effects/Sk1DPathEffect.cpp", "$_src/effects/Sk2DPathEffect.cpp", "$_src/effects/SkColorMatrix.cpp", @@ -51,7 +50,6 @@ skia_effects_sources = [ "$_src/effects/SkTableColorFilter.cpp", "$_src/effects/SkTableMaskFilter.cpp", "$_src/effects/SkTrimPathEffect.cpp", - "$_src/shaders/SkPerlinNoiseShader.cpp", "$_src/shaders/gradients/Sk4fGradientBase.cpp", "$_src/shaders/gradients/Sk4fGradientBase.h", @@ -64,8 +62,8 @@ skia_effects_sources = [ "$_src/shaders/gradients/SkLinearGradient.h", "$_src/shaders/gradients/SkRadialGradient.cpp", "$_src/shaders/gradients/SkRadialGradient.h", - "$_src/shaders/gradients/SkTwoPointConicalGradient.cpp", - "$_src/shaders/gradients/SkTwoPointConicalGradient.h", "$_src/shaders/gradients/SkSweepGradient.cpp", "$_src/shaders/gradients/SkSweepGradient.h", + "$_src/shaders/gradients/SkTwoPointConicalGradient.cpp", + "$_src/shaders/gradients/SkTwoPointConicalGradient.h", ] diff --git a/skia/gn/gm.gni b/skia/gn/gm.gni index 8f7df05ac98e6ffcddb2d537833db988a6d649ce..89d3a527f6e902b6bb44b8510e39f637e5b5ef48 100644 --- a/skia/gn/gm.gni +++ b/skia/gn/gm.gni @@ -281,8 +281,8 @@ gm_sources = [ "$_gm/poly2poly.cpp", "$_gm/polygonoffset.cpp", "$_gm/polygons.cpp", - "$_gm/preservefillrule.cpp", "$_gm/postercircle.cpp", + "$_gm/preservefillrule.cpp", "$_gm/quadpaths.cpp", "$_gm/radial_gradient_precision.cpp", "$_gm/rasterhandleallocator.cpp", diff --git a/skia/gn/gpu.gni b/skia/gn/gpu.gni index 115e94f8065a4b1264c61e4febcb8fffaf86c985..464e8ffc53094efa1940240dec0bfebc23aabae1 100644 --- a/skia/gn/gpu.gni +++ b/skia/gn/gpu.gni @@ -12,15 +12,14 @@ skia_gpu_sources = [ "$_include/gpu/GrBackendSemaphore.h", "$_include/gpu/GrBackendSurface.h", "$_include/gpu/GrConfig.h", - "$_include/gpu/GrContextOptions.h", "$_include/gpu/GrContext.h", + "$_include/gpu/GrContextOptions.h", "$_include/gpu/GrContextThreadSafeProxy.h", "$_include/gpu/GrDriverBugWorkarounds.h", "$_include/gpu/GrGpuResource.h", "$_include/gpu/GrSurface.h", "$_include/gpu/GrTexture.h", "$_include/gpu/GrTypes.h", - "$_include/gpu/gl/GrGLAssembleInterface.h", "$_include/gpu/gl/GrGLConfig.h", "$_include/gpu/gl/GrGLExtensions.h", @@ -36,48 +35,47 @@ skia_gpu_sources = [ "$_include/private/GrResourceKey.h", "$_include/private/GrSingleOwner.h", "$_include/private/GrTypesPriv.h", - + "$_src/gpu/GrAHardwareBufferImageGenerator.cpp", + "$_src/gpu/GrAHardwareBufferImageGenerator.h", + "$_src/gpu/GrAHardwareBufferUtils.cpp", + "$_src/gpu/GrAHardwareBufferUtils.h", + "$_src/gpu/GrAllocator.h", "$_src/gpu/GrAppliedClip.h", "$_src/gpu/GrAuditTrail.cpp", "$_src/gpu/GrAuditTrail.h", "$_src/gpu/GrAutoLocaleSetter.h", - "$_src/gpu/GrAllocator.h", "$_src/gpu/GrBackendSurface.cpp", "$_src/gpu/GrBackendTextureImageGenerator.cpp", "$_src/gpu/GrBackendTextureImageGenerator.h", - "$_src/gpu/GrBlend.h", - "$_src/gpu/GrAHardwareBufferImageGenerator.cpp", - "$_src/gpu/GrAHardwareBufferImageGenerator.h", - "$_src/gpu/GrAHardwareBufferUtils.cpp", - "$_src/gpu/GrAHardwareBufferUtils.h", "$_src/gpu/GrBaseContextPriv.h", "$_src/gpu/GrBitmapTextureMaker.cpp", "$_src/gpu/GrBitmapTextureMaker.h", + "$_src/gpu/GrBlend.h", "$_src/gpu/GrBlurUtils.cpp", "$_src/gpu/GrBlurUtils.h", "$_src/gpu/GrBuffer.h", "$_src/gpu/GrBufferAllocPool.cpp", "$_src/gpu/GrBufferAllocPool.h", - "$_src/gpu/GrCaps.h", "$_src/gpu/GrCaps.cpp", + "$_src/gpu/GrCaps.h", "$_src/gpu/GrClip.h", - "$_src/gpu/GrClipStackClip.h", "$_src/gpu/GrClipStackClip.cpp", + "$_src/gpu/GrClipStackClip.h", "$_src/gpu/GrColor.h", "$_src/gpu/GrColorSpaceInfo.cpp", "$_src/gpu/GrColorSpaceXform.cpp", "$_src/gpu/GrColorSpaceXform.h", "$_src/gpu/GrContext.cpp", - "$_src/gpu/GrContext_Base.cpp", "$_src/gpu/GrContextPriv.cpp", "$_src/gpu/GrContextPriv.h", "$_src/gpu/GrContextThreadSafeProxy.cpp", "$_src/gpu/GrContextThreadSafeProxyPriv.h", + "$_src/gpu/GrContext_Base.cpp", "$_src/gpu/GrCoordTransform.h", "$_src/gpu/GrCpuBuffer.h", - "$_src/gpu/GrDataUtils.h", - "$_src/gpu/GrDataUtils.cpp", "$_src/gpu/GrDDLContext.cpp", + "$_src/gpu/GrDataUtils.cpp", + "$_src/gpu/GrDataUtils.h", "$_src/gpu/GrDefaultGeoProcFactory.cpp", "$_src/gpu/GrDefaultGeoProcFactory.h", "$_src/gpu/GrDeferredProxyUploader.h", @@ -86,12 +84,12 @@ skia_gpu_sources = [ "$_src/gpu/GrDeinstantiateProxyTracker.h", "$_src/gpu/GrDistanceFieldGenFromVector.cpp", "$_src/gpu/GrDistanceFieldGenFromVector.h", - "$_src/gpu/GrDrawingManager.cpp", - "$_src/gpu/GrDrawingManager.h", "$_src/gpu/GrDrawOpAtlas.cpp", "$_src/gpu/GrDrawOpAtlas.h", "$_src/gpu/GrDrawOpTest.cpp", "$_src/gpu/GrDrawOpTest.h", + "$_src/gpu/GrDrawingManager.cpp", + "$_src/gpu/GrDrawingManager.h", "$_src/gpu/GrDriverBugWorkarounds.cpp", "$_src/gpu/GrFixedClip.cpp", "$_src/gpu/GrFixedClip.h", @@ -103,11 +101,11 @@ skia_gpu_sources = [ "$_src/gpu/GrGpu.h", "$_src/gpu/GrGpuBuffer.cpp", "$_src/gpu/GrGpuBuffer.h", - "$_src/gpu/GrGpuResourceCacheAccess.h", "$_src/gpu/GrGpuCommandBuffer.cpp", "$_src/gpu/GrGpuCommandBuffer.h", - "$_src/gpu/GrGpuResourcePriv.h", "$_src/gpu/GrGpuResource.cpp", + "$_src/gpu/GrGpuResourceCacheAccess.h", + "$_src/gpu/GrGpuResourcePriv.h", "$_src/gpu/GrImageContext.cpp", "$_src/gpu/GrImageContextPriv.h", "$_src/gpu/GrImageTextureMaker.cpp", @@ -117,33 +115,33 @@ skia_gpu_sources = [ "$_src/gpu/GrMemoryPool.h", "$_src/gpu/GrMesh.h", "$_src/gpu/GrNonAtomicRef.h", + "$_src/gpu/GrOnFlushResourceProvider.cpp", + "$_src/gpu/GrOnFlushResourceProvider.h", "$_src/gpu/GrOpFlushState.cpp", "$_src/gpu/GrOpFlushState.h", "$_src/gpu/GrOpList.cpp", "$_src/gpu/GrOpList.h", "$_src/gpu/GrPaint.cpp", "$_src/gpu/GrPaint.h", - "$_src/gpu/GrPathRendererChain.cpp", - "$_src/gpu/GrPathRendererChain.h", "$_src/gpu/GrPathRenderer.cpp", "$_src/gpu/GrPathRenderer.h", + "$_src/gpu/GrPathRendererChain.cpp", + "$_src/gpu/GrPathRendererChain.h", "$_src/gpu/GrPendingIOResource.h", - "$_src/gpu/GrOnFlushResourceProvider.cpp", - "$_src/gpu/GrOnFlushResourceProvider.h", "$_src/gpu/GrPipeline.cpp", "$_src/gpu/GrPipeline.h", "$_src/gpu/GrPrimitiveProcessor.cpp", "$_src/gpu/GrPrimitiveProcessor.h", - "$_src/gpu/GrProcessorSet.cpp", - "$_src/gpu/GrProcessorSet.h", - "$_src/gpu/GrProgramDesc.cpp", - "$_src/gpu/GrProgramDesc.h", "$_src/gpu/GrProcessor.cpp", "$_src/gpu/GrProcessor.h", "$_src/gpu/GrProcessorAnalysis.cpp", "$_src/gpu/GrProcessorAnalysis.h", + "$_src/gpu/GrProcessorSet.cpp", + "$_src/gpu/GrProcessorSet.h", "$_src/gpu/GrProcessorUnitTest.cpp", "$_src/gpu/GrProcessorUnitTest.h", + "$_src/gpu/GrProgramDesc.cpp", + "$_src/gpu/GrProgramDesc.h", "$_src/gpu/GrProxyProvider.cpp", "$_src/gpu/GrProxyProvider.h", "$_src/gpu/GrRecordingContext.cpp", @@ -153,21 +151,21 @@ skia_gpu_sources = [ "$_src/gpu/GrRectanizer_pow2.h", "$_src/gpu/GrRectanizer_skyline.cpp", "$_src/gpu/GrRectanizer_skyline.h", + "$_src/gpu/GrReducedClip.cpp", + "$_src/gpu/GrReducedClip.h", "$_src/gpu/GrRenderTarget.cpp", "$_src/gpu/GrRenderTarget.h", + "$_src/gpu/GrRenderTargetContext.cpp", + "$_src/gpu/GrRenderTargetContext.h", + "$_src/gpu/GrRenderTargetContextPriv.h", + "$_src/gpu/GrRenderTargetOpList.cpp", + "$_src/gpu/GrRenderTargetOpList.h", "$_src/gpu/GrRenderTargetPriv.h", "$_src/gpu/GrRenderTargetProxy.cpp", "$_src/gpu/GrRenderTargetProxy.h", "$_src/gpu/GrRenderTargetProxyPriv.h", "$_src/gpu/GrRenderTask.cpp", "$_src/gpu/GrRenderTask.h", - "$_src/gpu/GrReducedClip.cpp", - "$_src/gpu/GrReducedClip.h", - "$_src/gpu/GrRenderTargetContext.cpp", - "$_src/gpu/GrRenderTargetContext.h", - "$_src/gpu/GrRenderTargetContextPriv.h", - "$_src/gpu/GrRenderTargetOpList.cpp", - "$_src/gpu/GrRenderTargetOpList.h", "$_src/gpu/GrResourceAllocator.cpp", "$_src/gpu/GrResourceAllocator.h", "$_src/gpu/GrResourceCache.cpp", @@ -176,13 +174,15 @@ skia_gpu_sources = [ "$_src/gpu/GrResourceProvider.cpp", "$_src/gpu/GrResourceProvider.h", "$_src/gpu/GrResourceProviderPriv.h", - "$_src/gpu/GrSamplePatternDictionary.h", + "$_src/gpu/GrSWMaskHelper.cpp", + "$_src/gpu/GrSWMaskHelper.h", "$_src/gpu/GrSamplePatternDictionary.cpp", + "$_src/gpu/GrSamplePatternDictionary.h", "$_src/gpu/GrSamplerState.h", "$_src/gpu/GrScissorState.h", "$_src/gpu/GrSemaphore.h", - "$_src/gpu/GrShaderCaps.h", "$_src/gpu/GrShaderCaps.cpp", + "$_src/gpu/GrShaderCaps.h", "$_src/gpu/GrShaderUtils.cpp", "$_src/gpu/GrShaderUtils.h", "$_src/gpu/GrShaderVar.cpp", @@ -200,15 +200,13 @@ skia_gpu_sources = [ "$_src/gpu/GrSurfaceContext.cpp", "$_src/gpu/GrSurfaceContext.h", "$_src/gpu/GrSurfaceContextPriv.h", + "$_src/gpu/GrSurfacePriv.h", "$_src/gpu/GrSurfaceProxy.cpp", "$_src/gpu/GrSurfaceProxy.h", "$_src/gpu/GrSurfaceProxyPriv.h", - "$_src/gpu/GrSurfacePriv.h", "$_src/gpu/GrSwizzle.cpp", "$_src/gpu/GrSwizzle.h", - "$_src/gpu/GrSWMaskHelper.cpp", - "$_src/gpu/GrSWMaskHelper.h", - "$_src/gpu/GrTracing.h", + "$_src/gpu/GrTRecorder.h", "$_src/gpu/GrTessellator.cpp", "$_src/gpu/GrTessellator.h", "$_src/gpu/GrTestUtils.cpp", @@ -234,7 +232,7 @@ skia_gpu_sources = [ "$_src/gpu/GrTextureResolveManager.h", "$_src/gpu/GrTextureResolveRenderTask.cpp", "$_src/gpu/GrTextureResolveRenderTask.h", - "$_src/gpu/GrTRecorder.h", + "$_src/gpu/GrTracing.h", "$_src/gpu/GrUserStencilSettings.h", "$_src/gpu/GrWindowRectangles.h", "$_src/gpu/GrWindowRectsState.h", @@ -244,82 +242,18 @@ skia_gpu_sources = [ "$_src/gpu/GrYUVProvider.h", # Ops - "$_src/gpu/ops/GrAAConvexTessellator.cpp", - "$_src/gpu/ops/GrAAConvexTessellator.h", - "$_src/gpu/ops/GrAAConvexPathRenderer.cpp", - "$_src/gpu/ops/GrAAConvexPathRenderer.h", - "$_src/gpu/ops/GrAAHairLinePathRenderer.cpp", - "$_src/gpu/ops/GrAAHairLinePathRenderer.h", - "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp", - "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.h", - "$_src/gpu/ops/GrAtlasTextOp.cpp", - "$_src/gpu/ops/GrAtlasTextOp.h", - "$_src/gpu/ops/GrClearOp.cpp", - "$_src/gpu/ops/GrClearOp.h", - "$_src/gpu/ops/GrClearStencilClipOp.cpp", - "$_src/gpu/ops/GrClearStencilClipOp.h", - "$_src/gpu/ops/GrCopySurfaceOp.cpp", - "$_src/gpu/ops/GrCopySurfaceOp.h", - "$_src/gpu/ops/GrDashLinePathRenderer.cpp", - "$_src/gpu/ops/GrDashLinePathRenderer.h", - "$_src/gpu/ops/GrDashOp.cpp", - "$_src/gpu/ops/GrDashOp.h", - "$_src/gpu/ops/GrDefaultPathRenderer.cpp", - "$_src/gpu/ops/GrDefaultPathRenderer.h", - "$_src/gpu/ops/GrDebugMarkerOp.cpp", - "$_src/gpu/ops/GrDebugMarkerOp.h", - "$_src/gpu/ops/GrDrawableOp.cpp", - "$_src/gpu/ops/GrDrawableOp.h", - "$_src/gpu/ops/GrDrawAtlasOp.cpp", - "$_src/gpu/ops/GrDrawAtlasOp.h", - "$_src/gpu/ops/GrDrawOp.h", - "$_src/gpu/ops/GrDrawVerticesOp.cpp", - "$_src/gpu/ops/GrDrawVerticesOp.h", - "$_src/gpu/ops/GrFillRectOp.cpp", - "$_src/gpu/ops/GrFillRectOp.h", - "$_src/gpu/ops/GrFillRRectOp.cpp", - "$_src/gpu/ops/GrFillRRectOp.h", - "$_src/gpu/ops/GrMeshDrawOp.cpp", - "$_src/gpu/ops/GrMeshDrawOp.h", - "$_src/gpu/ops/GrLatticeOp.cpp", - "$_src/gpu/ops/GrLatticeOp.h", - "$_src/gpu/ops/GrOp.cpp", - "$_src/gpu/ops/GrOp.h", - "$_src/gpu/ops/GrOvalOpFactory.cpp", - "$_src/gpu/ops/GrOvalOpFactory.h", - "$_src/gpu/ops/GrQuadPerEdgeAA.cpp", - "$_src/gpu/ops/GrQuadPerEdgeAA.h", - "$_src/gpu/ops/GrRegionOp.cpp", - "$_src/gpu/ops/GrRegionOp.h", - "$_src/gpu/ops/GrSemaphoreOp.cpp", - "$_src/gpu/ops/GrSemaphoreOp.h", - "$_src/gpu/ops/GrShadowRRectOp.cpp", - "$_src/gpu/ops/GrShadowRRectOp.h", - "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp", - "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.h", - "$_src/gpu/ops/GrSmallPathRenderer.cpp", - "$_src/gpu/ops/GrSmallPathRenderer.h", - "$_src/gpu/ops/GrStrokeRectOp.cpp", - "$_src/gpu/ops/GrStrokeRectOp.h", - "$_src/gpu/ops/GrTessellatingPathRenderer.cpp", - "$_src/gpu/ops/GrTessellatingPathRenderer.h", - "$_src/gpu/ops/GrTextureOp.cpp", - "$_src/gpu/ops/GrTextureOp.h", - "$_src/gpu/ops/GrTransferFromOp.cpp", - "$_src/gpu/ops/GrTransferFromOp.h", - - "$_src/gpu/effects/GrCoverageSetOpXP.cpp", - "$_src/gpu/effects/GrCoverageSetOpXP.h", - "$_src/gpu/effects/GrCustomXfermode.cpp", - "$_src/gpu/effects/GrCustomXfermode.h", "$_src/gpu/effects/GrBezierEffect.cpp", "$_src/gpu/effects/GrBezierEffect.h", - "$_src/gpu/effects/GrConvexPolyEffect.cpp", - "$_src/gpu/effects/GrConvexPolyEffect.h", "$_src/gpu/effects/GrBicubicEffect.cpp", "$_src/gpu/effects/GrBicubicEffect.h", "$_src/gpu/effects/GrBitmapTextGeoProc.cpp", "$_src/gpu/effects/GrBitmapTextGeoProc.h", + "$_src/gpu/effects/GrConvexPolyEffect.cpp", + "$_src/gpu/effects/GrConvexPolyEffect.h", + "$_src/gpu/effects/GrCoverageSetOpXP.cpp", + "$_src/gpu/effects/GrCoverageSetOpXP.h", + "$_src/gpu/effects/GrCustomXfermode.cpp", + "$_src/gpu/effects/GrCustomXfermode.h", "$_src/gpu/effects/GrDisableColorXP.cpp", "$_src/gpu/effects/GrDisableColorXP.h", "$_src/gpu/effects/GrDistanceFieldGeoProc.cpp", @@ -334,30 +268,18 @@ skia_gpu_sources = [ "$_src/gpu/effects/GrPorterDuffXferProcessor.h", "$_src/gpu/effects/GrRRectEffect.cpp", "$_src/gpu/effects/GrRRectEffect.h", + "$_src/gpu/effects/GrSRGBEffect.cpp", + "$_src/gpu/effects/GrSRGBEffect.h", "$_src/gpu/effects/GrShadowGeoProc.cpp", "$_src/gpu/effects/GrShadowGeoProc.h", "$_src/gpu/effects/GrSkSLFP.cpp", "$_src/gpu/effects/GrSkSLFP.h", - "$_src/gpu/effects/GrSRGBEffect.cpp", - "$_src/gpu/effects/GrSRGBEffect.h", "$_src/gpu/effects/GrTextureDomain.cpp", "$_src/gpu/effects/GrTextureDomain.h", "$_src/gpu/effects/GrXfermodeFragmentProcessor.cpp", "$_src/gpu/effects/GrXfermodeFragmentProcessor.h", "$_src/gpu/effects/GrYUVtoRGBEffect.cpp", "$_src/gpu/effects/GrYUVtoRGBEffect.h", - - "$_src/gpu/geometry/GrPathUtils.cpp", - "$_src/gpu/geometry/GrPathUtils.h", - "$_src/gpu/geometry/GrQuad.cpp", - "$_src/gpu/geometry/GrQuad.h", - "$_src/gpu/geometry/GrQuadBuffer.h", - "$_src/gpu/geometry/GrQuadUtils.cpp", - "$_src/gpu/geometry/GrQuadUtils.h", - "$_src/gpu/geometry/GrRect.h", - "$_src/gpu/geometry/GrShape.cpp", - "$_src/gpu/geometry/GrShape.h", - "$_src/gpu/effects/generated/GrAARectEffect.cpp", "$_src/gpu/effects/generated/GrAARectEffect.h", "$_src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp", @@ -390,58 +312,113 @@ skia_gpu_sources = [ "$_src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h", "$_src/gpu/effects/generated/GrPremulInputFragmentProcessor.cpp", "$_src/gpu/effects/generated/GrPremulInputFragmentProcessor.h", - "$_src/gpu/effects/generated/GrRectBlurEffect.cpp", - "$_src/gpu/effects/generated/GrRectBlurEffect.h", "$_src/gpu/effects/generated/GrRRectBlurEffect.cpp", "$_src/gpu/effects/generated/GrRRectBlurEffect.h", + "$_src/gpu/effects/generated/GrRectBlurEffect.cpp", + "$_src/gpu/effects/generated/GrRectBlurEffect.h", "$_src/gpu/effects/generated/GrSimpleTextureEffect.cpp", "$_src/gpu/effects/generated/GrSimpleTextureEffect.h", + "$_src/gpu/geometry/GrPathUtils.cpp", + "$_src/gpu/geometry/GrPathUtils.h", + "$_src/gpu/geometry/GrQuad.cpp", + "$_src/gpu/geometry/GrQuad.h", + "$_src/gpu/geometry/GrQuadBuffer.h", + "$_src/gpu/geometry/GrQuadUtils.cpp", + "$_src/gpu/geometry/GrQuadUtils.h", + "$_src/gpu/geometry/GrRect.h", + "$_src/gpu/geometry/GrShape.cpp", + "$_src/gpu/geometry/GrShape.h", + "$_src/gpu/ops/GrAAConvexPathRenderer.cpp", + "$_src/gpu/ops/GrAAConvexPathRenderer.h", + "$_src/gpu/ops/GrAAConvexTessellator.cpp", + "$_src/gpu/ops/GrAAConvexTessellator.h", + "$_src/gpu/ops/GrAAHairLinePathRenderer.cpp", + "$_src/gpu/ops/GrAAHairLinePathRenderer.h", + "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp", + "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.h", + "$_src/gpu/ops/GrAtlasTextOp.cpp", + "$_src/gpu/ops/GrAtlasTextOp.h", + "$_src/gpu/ops/GrClearOp.cpp", + "$_src/gpu/ops/GrClearOp.h", + "$_src/gpu/ops/GrClearStencilClipOp.cpp", + "$_src/gpu/ops/GrClearStencilClipOp.h", + "$_src/gpu/ops/GrCopySurfaceOp.cpp", + "$_src/gpu/ops/GrCopySurfaceOp.h", + "$_src/gpu/ops/GrDashLinePathRenderer.cpp", + "$_src/gpu/ops/GrDashLinePathRenderer.h", + "$_src/gpu/ops/GrDashOp.cpp", + "$_src/gpu/ops/GrDashOp.h", + "$_src/gpu/ops/GrDebugMarkerOp.cpp", + "$_src/gpu/ops/GrDebugMarkerOp.h", + "$_src/gpu/ops/GrDefaultPathRenderer.cpp", + "$_src/gpu/ops/GrDefaultPathRenderer.h", + "$_src/gpu/ops/GrDrawAtlasOp.cpp", + "$_src/gpu/ops/GrDrawAtlasOp.h", + "$_src/gpu/ops/GrDrawOp.h", + "$_src/gpu/ops/GrDrawVerticesOp.cpp", + "$_src/gpu/ops/GrDrawVerticesOp.h", + "$_src/gpu/ops/GrDrawableOp.cpp", + "$_src/gpu/ops/GrDrawableOp.h", + "$_src/gpu/ops/GrFillRRectOp.cpp", + "$_src/gpu/ops/GrFillRRectOp.h", + "$_src/gpu/ops/GrFillRectOp.cpp", + "$_src/gpu/ops/GrFillRectOp.h", + "$_src/gpu/ops/GrLatticeOp.cpp", + "$_src/gpu/ops/GrLatticeOp.h", + "$_src/gpu/ops/GrMeshDrawOp.cpp", + "$_src/gpu/ops/GrMeshDrawOp.h", + "$_src/gpu/ops/GrOp.cpp", + "$_src/gpu/ops/GrOp.h", + "$_src/gpu/ops/GrOvalOpFactory.cpp", + "$_src/gpu/ops/GrOvalOpFactory.h", + "$_src/gpu/ops/GrQuadPerEdgeAA.cpp", + "$_src/gpu/ops/GrQuadPerEdgeAA.h", + "$_src/gpu/ops/GrRegionOp.cpp", + "$_src/gpu/ops/GrRegionOp.h", + "$_src/gpu/ops/GrSemaphoreOp.cpp", + "$_src/gpu/ops/GrSemaphoreOp.h", + "$_src/gpu/ops/GrShadowRRectOp.cpp", + "$_src/gpu/ops/GrShadowRRectOp.h", + "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp", + "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.h", + "$_src/gpu/ops/GrSmallPathRenderer.cpp", + "$_src/gpu/ops/GrSmallPathRenderer.h", + "$_src/gpu/ops/GrStrokeRectOp.cpp", + "$_src/gpu/ops/GrStrokeRectOp.h", + "$_src/gpu/ops/GrTessellatingPathRenderer.cpp", + "$_src/gpu/ops/GrTessellatingPathRenderer.h", + "$_src/gpu/ops/GrTextureOp.cpp", + "$_src/gpu/ops/GrTextureOp.h", + "$_src/gpu/ops/GrTransferFromOp.cpp", + "$_src/gpu/ops/GrTransferFromOp.h", # gradients "$_src/gpu/gradients/GrGradientBitmapCache.cpp", "$_src/gpu/gradients/GrGradientBitmapCache.h", "$_src/gpu/gradients/GrGradientShader.cpp", "$_src/gpu/gradients/GrGradientShader.h", - + "$_src/gpu/gradients/generated/GrClampedGradientEffect.cpp", + "$_src/gpu/gradients/generated/GrClampedGradientEffect.h", "$_src/gpu/gradients/generated/GrDualIntervalGradientColorizer.cpp", "$_src/gpu/gradients/generated/GrDualIntervalGradientColorizer.h", - "$_src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp", - "$_src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h", - "$_src/gpu/gradients/generated/GrTextureGradientColorizer.cpp", - "$_src/gpu/gradients/generated/GrTextureGradientColorizer.h", - "$_src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp", - "$_src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h", "$_src/gpu/gradients/generated/GrLinearGradientLayout.cpp", "$_src/gpu/gradients/generated/GrLinearGradientLayout.h", "$_src/gpu/gradients/generated/GrRadialGradientLayout.cpp", "$_src/gpu/gradients/generated/GrRadialGradientLayout.h", + "$_src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp", + "$_src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h", "$_src/gpu/gradients/generated/GrSweepGradientLayout.cpp", "$_src/gpu/gradients/generated/GrSweepGradientLayout.h", - "$_src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp", - "$_src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h", - "$_src/gpu/gradients/generated/GrClampedGradientEffect.cpp", - "$_src/gpu/gradients/generated/GrClampedGradientEffect.h", + "$_src/gpu/gradients/generated/GrTextureGradientColorizer.cpp", + "$_src/gpu/gradients/generated/GrTextureGradientColorizer.h", "$_src/gpu/gradients/generated/GrTiledGradientEffect.cpp", "$_src/gpu/gradients/generated/GrTiledGradientEffect.h", + "$_src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp", + "$_src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h", + "$_src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp", + "$_src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h", # text - "$_src/gpu/text/GrAtlasManager.cpp", - "$_src/gpu/text/GrAtlasManager.h", - "$_src/gpu/text/GrDistanceFieldAdjustTable.cpp", - "$_src/gpu/text/GrDistanceFieldAdjustTable.h", - "$_src/gpu/text/GrSDFMaskFilter.cpp", - "$_src/gpu/text/GrSDFMaskFilter.h", - "$_src/gpu/text/GrStrikeCache.cpp", - "$_src/gpu/text/GrStrikeCache.h", - "$_src/gpu/text/GrTextBlob.cpp", - "$_src/gpu/text/GrTextBlob.h", - "$_src/gpu/text/GrTextBlobCache.cpp", - "$_src/gpu/text/GrTextBlobCache.h", - "$_src/gpu/text/GrTextContext.cpp", - "$_src/gpu/text/GrTextContext.h", - "$_src/gpu/text/GrTextBlobVertexRegenerator.cpp", - "$_src/gpu/text/GrTextTarget.h", - "$_src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp", "$_src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp", "$_src/gpu/gl/GrGLAssembleHelpers.cpp", @@ -453,8 +430,8 @@ skia_gpu_sources = [ "$_src/gpu/gl/GrGLCaps.h", "$_src/gpu/gl/GrGLContext.cpp", "$_src/gpu/gl/GrGLContext.h", - "$_src/gpu/gl/GrGLMakeNativeInterface_none.cpp", "$_src/gpu/gl/GrGLDefines.h", + "$_src/gpu/gl/GrGLExtensions.cpp", "$_src/gpu/gl/GrGLGLSL.cpp", "$_src/gpu/gl/GrGLGLSL.h", "$_src/gpu/gl/GrGLGpu.cpp", @@ -462,9 +439,9 @@ skia_gpu_sources = [ "$_src/gpu/gl/GrGLGpuCommandBuffer.cpp", "$_src/gpu/gl/GrGLGpuCommandBuffer.h", "$_src/gpu/gl/GrGLGpuProgramCache.cpp", - "$_src/gpu/gl/GrGLExtensions.cpp", - "$_src/gpu/gl/GrGLInterfaceAutogen.cpp", "$_src/gpu/gl/GrGLIRect.h", + "$_src/gpu/gl/GrGLInterfaceAutogen.cpp", + "$_src/gpu/gl/GrGLMakeNativeInterface_none.cpp", "$_src/gpu/gl/GrGLProgram.cpp", "$_src/gpu/gl/GrGLProgram.h", "$_src/gpu/gl/GrGLProgramDataManager.cpp", @@ -480,14 +457,30 @@ skia_gpu_sources = [ "$_src/gpu/gl/GrGLTextureRenderTarget.cpp", "$_src/gpu/gl/GrGLTextureRenderTarget.h", "$_src/gpu/gl/GrGLTypesPriv.cpp", - "$_src/gpu/gl/GrGLUtil.cpp", - "$_src/gpu/gl/GrGLUtil.h", "$_src/gpu/gl/GrGLUniformHandler.cpp", "$_src/gpu/gl/GrGLUniformHandler.h", + "$_src/gpu/gl/GrGLUtil.cpp", + "$_src/gpu/gl/GrGLUtil.h", "$_src/gpu/gl/GrGLVaryingHandler.cpp", "$_src/gpu/gl/GrGLVaryingHandler.h", "$_src/gpu/gl/GrGLVertexArray.cpp", "$_src/gpu/gl/GrGLVertexArray.h", + "$_src/gpu/text/GrAtlasManager.cpp", + "$_src/gpu/text/GrAtlasManager.h", + "$_src/gpu/text/GrDistanceFieldAdjustTable.cpp", + "$_src/gpu/text/GrDistanceFieldAdjustTable.h", + "$_src/gpu/text/GrSDFMaskFilter.cpp", + "$_src/gpu/text/GrSDFMaskFilter.h", + "$_src/gpu/text/GrStrikeCache.cpp", + "$_src/gpu/text/GrStrikeCache.h", + "$_src/gpu/text/GrTextBlob.cpp", + "$_src/gpu/text/GrTextBlob.h", + "$_src/gpu/text/GrTextBlobCache.cpp", + "$_src/gpu/text/GrTextBlobCache.h", + "$_src/gpu/text/GrTextBlobVertexRegenerator.cpp", + "$_src/gpu/text/GrTextContext.cpp", + "$_src/gpu/text/GrTextContext.h", + "$_src/gpu/text/GrTextTarget.h", # Files for building GLSL shaders "$_src/gpu/gl/builders/GrGLProgramBuilder.cpp", @@ -540,17 +533,16 @@ skia_gpu_sources = [ "$_src/gpu/SkGpuDevice.cpp", "$_src/gpu/SkGpuDevice.h", "$_src/gpu/SkGpuDevice_drawTexture.cpp", - "$_src/gpu/SkGr.h", "$_src/gpu/SkGr.cpp", - - "$_src/image/SkImage_Gpu.h", + "$_src/gpu/SkGr.h", "$_src/image/SkImage_Gpu.cpp", - "$_src/image/SkImage_GpuBase.h", + "$_src/image/SkImage_Gpu.h", "$_src/image/SkImage_GpuBase.cpp", - "$_src/image/SkImage_GpuYUVA.h", + "$_src/image/SkImage_GpuBase.h", "$_src/image/SkImage_GpuYUVA.cpp", - "$_src/image/SkSurface_Gpu.h", + "$_src/image/SkImage_GpuYUVA.h", "$_src/image/SkSurface_Gpu.cpp", + "$_src/image/SkSurface_Gpu.h", ] skia_ccpr_sources = [ @@ -569,10 +561,10 @@ skia_ccpr_sources = [ "$_src/gpu/ccpr/GrCCCubicShader.h", "$_src/gpu/ccpr/GrCCDrawPathsOp.cpp", "$_src/gpu/ccpr/GrCCDrawPathsOp.h", - "$_src/gpu/ccpr/GrCCFiller.cpp", - "$_src/gpu/ccpr/GrCCFiller.h", "$_src/gpu/ccpr/GrCCFillGeometry.cpp", "$_src/gpu/ccpr/GrCCFillGeometry.h", + "$_src/gpu/ccpr/GrCCFiller.cpp", + "$_src/gpu/ccpr/GrCCFiller.h", "$_src/gpu/ccpr/GrCCPathCache.cpp", "$_src/gpu/ccpr/GrCCPathCache.h", "$_src/gpu/ccpr/GrCCPathProcessor.cpp", @@ -722,10 +714,10 @@ skia_dawn_sources = [ "$_src/gpu/dawn/GrDawnGpu.h", "$_src/gpu/dawn/GrDawnGpuCommandBuffer.cpp", "$_src/gpu/dawn/GrDawnGpuCommandBuffer.h", - "$_src/gpu/dawn/GrDawnProgramDataManager.cpp", - "$_src/gpu/dawn/GrDawnProgramDataManager.h", "$_src/gpu/dawn/GrDawnProgramBuilder.cpp", "$_src/gpu/dawn/GrDawnProgramBuilder.h", + "$_src/gpu/dawn/GrDawnProgramDataManager.cpp", + "$_src/gpu/dawn/GrDawnProgramDataManager.h", "$_src/gpu/dawn/GrDawnRenderTarget.cpp", "$_src/gpu/dawn/GrDawnRenderTarget.h", "$_src/gpu/dawn/GrDawnStencilAttachment.cpp", @@ -786,12 +778,12 @@ skia_metal_sources = [ ] skia_native_gpu_sources = [ - "$_src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp", - "$_src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp", - "$_src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp", + "$_src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp", "$_src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "$_src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp", "$_src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", - "$_src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp", + "$_src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp", + "$_src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp", ] skia_atlas_text_sources = [ @@ -799,7 +791,6 @@ skia_atlas_text_sources = [ "$_include/atlastext/SkAtlasTextFont.h", "$_include/atlastext/SkAtlasTextRenderer.h", "$_include/atlastext/SkAtlasTextTarget.h", - "$_src/atlastext/SkAtlasTextContext.cpp", "$_src/atlastext/SkAtlasTextTarget.cpp", "$_src/atlastext/SkInternalAtlasTextContext.cpp", diff --git a/skia/gn/samples.gni b/skia/gn/samples.gni index 49f8d211f1996753bceec99b94cb4b99aee6e535..1241a34296019f6f640c2a76601e1882860a49fd 100644 --- a/skia/gn/samples.gni +++ b/skia/gn/samples.gni @@ -16,9 +16,9 @@ samples_sources = [ "$_samplecode/SampleAARectModes.cpp", "$_samplecode/SampleAARects.cpp", "$_samplecode/SampleAndroidShadows.cpp", + "$_samplecode/SampleAnimBlur.cpp", "$_samplecode/SampleAnimatedImage.cpp", "$_samplecode/SampleAnimatedText.cpp", - "$_samplecode/SampleAnimBlur.cpp", "$_samplecode/SampleArc.cpp", "$_samplecode/SampleAtlas.cpp", "$_samplecode/SampleBitmapRect.cpp", @@ -45,15 +45,15 @@ samples_sources = [ "$_samplecode/SampleFlutterAnimate.cpp", "$_samplecode/SampleGlyphTransform.cpp", "$_samplecode/SampleGradients.cpp", + "$_samplecode/SampleHT.cpp", "$_samplecode/SampleHairCurves.cpp", - "$_samplecode/SampleHairline.cpp", "$_samplecode/SampleHairModes.cpp", - "$_samplecode/SampleHT.cpp", + "$_samplecode/SampleHairline.cpp", "$_samplecode/SampleIdentityScale.cpp", "$_samplecode/SampleImageFilterDAG.cpp", + "$_samplecode/SampleLCD.cpp", "$_samplecode/SampleLayerMask.cpp", "$_samplecode/SampleLayers.cpp", - "$_samplecode/SampleLCD.cpp", "$_samplecode/SampleLighting.cpp", "$_samplecode/SampleLitAtlas.cpp", "$_samplecode/SampleManyRects.cpp", @@ -61,16 +61,17 @@ samples_sources = [ "$_samplecode/SampleMixer.cpp", "$_samplecode/SamplePatch.cpp", "$_samplecode/SamplePath.cpp", - "$_samplecode/SamplePathText.cpp", "$_samplecode/SamplePathClip.cpp", "$_samplecode/SamplePathEffects.cpp", "$_samplecode/SamplePathOverstroke.cpp", + "$_samplecode/SamplePathText.cpp", "$_samplecode/SamplePolyToPoly.cpp", "$_samplecode/SampleQuadStroker.cpp", "$_samplecode/SampleRectanizer.cpp", "$_samplecode/SampleRegion.cpp", "$_samplecode/SampleRepeatTile.cpp", "$_samplecode/SampleSG.cpp", + "$_samplecode/SampleSVGFile.cpp", "$_samplecode/SampleShaders.cpp", "$_samplecode/SampleShadowColor.cpp", "$_samplecode/SampleShadowReference.cpp", @@ -81,7 +82,6 @@ samples_sources = [ "$_samplecode/SampleStrokePath.cpp", "$_samplecode/SampleStrokeRect.cpp", "$_samplecode/SampleSubpixelTranslate.cpp", - "$_samplecode/SampleSVGFile.cpp", "$_samplecode/SampleTextBox.cpp", "$_samplecode/SampleTextEffects.cpp", "$_samplecode/SampleTextureDomain.cpp", diff --git a/skia/gn/sksl.gni b/skia/gn/sksl.gni index 019b684374959bc40f9adbbac185f28a0ce37016..90466861609112538a5afd6afd564febe9530800 100644 --- a/skia/gn/sksl.gni +++ b/skia/gn/sksl.gni @@ -18,8 +18,8 @@ skia_sksl_sources = [ "$_src/sksl/SkSLParser.cpp", "$_src/sksl/SkSLString.cpp", "$_src/sksl/SkSLUtil.cpp", - "$_src/sksl/ir/SkSLSymbolTable.cpp", "$_src/sksl/ir/SkSLSetting.cpp", + "$_src/sksl/ir/SkSLSymbolTable.cpp", "$_src/sksl/ir/SkSLType.cpp", "$_src/sksl/ir/SkSLVariableReference.cpp", ] @@ -41,28 +41,28 @@ skia_gpu_processor_sources = [ "$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp", "$_src/gpu/effects/GrCircleBlurFragmentProcessor.fp", "$_src/gpu/effects/GrCircleEffect.fp", + "$_src/gpu/effects/GrColorMatrixFragmentProcessor.fp", "$_src/gpu/effects/GrComposeLerpEffect.fp", "$_src/gpu/effects/GrComposeLerpRedEffect.fp", "$_src/gpu/effects/GrConfigConversionEffect.fp", "$_src/gpu/effects/GrConstColorProcessor.fp", - "$_src/gpu/effects/GrColorMatrixFragmentProcessor.fp", "$_src/gpu/effects/GrEllipseEffect.fp", "$_src/gpu/effects/GrLumaColorFilterEffect.fp", "$_src/gpu/effects/GrMagnifierEffect.fp", "$_src/gpu/effects/GrMixerEffect.fp", "$_src/gpu/effects/GrOverrideInputFragmentProcessor.fp", "$_src/gpu/effects/GrPremulInputFragmentProcessor.fp", - "$_src/gpu/effects/GrRectBlurEffect.fp", "$_src/gpu/effects/GrRRectBlurEffect.fp", + "$_src/gpu/effects/GrRectBlurEffect.fp", "$_src/gpu/effects/GrSimpleTextureEffect.fp", + "$_src/gpu/gradients/GrClampedGradientEffect.fp", "$_src/gpu/gradients/GrDualIntervalGradientColorizer.fp", - "$_src/gpu/gradients/GrSingleIntervalGradientColorizer.fp", - "$_src/gpu/gradients/GrTextureGradientColorizer.fp", - "$_src/gpu/gradients/GrUnrolledBinaryGradientColorizer.fp", "$_src/gpu/gradients/GrLinearGradientLayout.fp", "$_src/gpu/gradients/GrRadialGradientLayout.fp", + "$_src/gpu/gradients/GrSingleIntervalGradientColorizer.fp", "$_src/gpu/gradients/GrSweepGradientLayout.fp", - "$_src/gpu/gradients/GrTwoPointConicalGradientLayout.fp", - "$_src/gpu/gradients/GrClampedGradientEffect.fp", + "$_src/gpu/gradients/GrTextureGradientColorizer.fp", "$_src/gpu/gradients/GrTiledGradientEffect.fp", + "$_src/gpu/gradients/GrTwoPointConicalGradientLayout.fp", + "$_src/gpu/gradients/GrUnrolledBinaryGradientColorizer.fp", ] diff --git a/skia/gn/tests.gni b/skia/gn/tests.gni index 951a04e417052a5cebbba26fde397423ae7faec9..83bbc178a6b1110ce020d3518a4af3fd4fb6fa3d 100644 --- a/skia/gn/tests.gni +++ b/skia/gn/tests.gni @@ -86,10 +86,10 @@ tests_sources = [ "$_tests/FontMgrTest.cpp", "$_tests/FontNamesTest.cpp", "$_tests/FrontBufferedStreamTest.cpp", + "$_tests/GLBackendSurfaceTest.cpp", "$_tests/GLProgramsTest.cpp", "$_tests/GeometryTest.cpp", "$_tests/GifTest.cpp", - "$_tests/GLBackendSurfaceTest.cpp", "$_tests/GlyphRunTest.cpp", "$_tests/GpuDrawPathTest.cpp", "$_tests/GpuRectanizerTest.cpp", @@ -154,8 +154,8 @@ tests_sources = [ "$_tests/MipMapTest.cpp", "$_tests/MultiSkpTest.cpp", "$_tests/NonlinearBlendingTest.cpp", - "$_tests/OctoBoundsTest.cpp", "$_tests/OSPathTest.cpp", + "$_tests/OctoBoundsTest.cpp", "$_tests/OffsetSimplePolyTest.cpp", "$_tests/OnFlushCallbackTest.cpp", "$_tests/OnceTest.cpp", diff --git a/skia/gn/toolchain/BUILD.gn b/skia/gn/toolchain/BUILD.gn index 6fc23b946a65723ebad75ad48dbff6a42601ff2d..81f2b0f39d411631a9033f4e0bf4e9d872383f47 100644 --- a/skia/gn/toolchain/BUILD.gn +++ b/skia/gn/toolchain/BUILD.gn @@ -75,9 +75,8 @@ toolchain("msvc") { _ml += "64" } command = "$env_setup \"$bin/$_ml.exe\" {{asmflags}} /nologo /c /Fo {{output}} {{source}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ] description = "assemble {{source}}" } @@ -88,9 +87,8 @@ toolchain("msvc") { # Label names may have spaces so pdbname must be quoted. command = "$env_setup $cc_wrapper $cl /nologo /showIncludes /FC {{defines}} {{include_dirs}} {{cflags}} $cl_m32_flag {{cflags_c}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" depsformat = "msvc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ] description = "compile {{source}}" } @@ -101,9 +99,8 @@ toolchain("msvc") { # Label names may have spaces so pdbname must be quoted. command = "$env_setup $cc_wrapper $cl /nologo /showIncludes /FC {{defines}} {{include_dirs}} {{cflags}} $cl_m32_flag {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" depsformat = "msvc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ] description = "compile {{source}}" } @@ -162,9 +159,7 @@ toolchain("msvc") { command = "$env_setup $link /nologo /OUT:$exename /PDB:$pdbname @$rspfile" default_output_extension = ".exe" default_output_dir = "{{root_out_dir}}" - outputs = [ - exename, - ] + outputs = [ exename ] # inputs_newline works around a fixed per-line buffer size in the linker. rspfile_content = "{{inputs_newline}} {{libs}} {{solibs}} {{ldflags}}" @@ -195,9 +190,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cc -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -205,9 +199,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cxx -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -215,9 +208,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cc -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objc}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -225,9 +217,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cxx -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -235,9 +226,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cc -MD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "assemble {{source}}" } @@ -246,9 +236,8 @@ template("gcc_like_toolchain") { rspfile_content = "{{inputs}}" ar_py = rebase_path("../ar.py") command = "python $ar_py $ar {{output}} $rspfile" - outputs = [ - "{{root_out_dir}}/{{target_output_name}}{{output_extension}}", - ] + outputs = + [ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" ] default_output_extension = ".a" output_prefix = "lib" description = "link {{output}}" @@ -279,9 +268,7 @@ template("gcc_like_toolchain") { } command = "$cxx -shared {{ldflags}} $_start_group @$rspfile {{solibs}} $_end_group {{libs}} $rpath -o {{output}}" - outputs = [ - "{{root_out_dir}}/$soname", - ] + outputs = [ "{{root_out_dir}}/$soname" ] output_prefix = "lib" default_output_extension = ".so" description = "link {{output}}" @@ -310,9 +297,7 @@ template("gcc_like_toolchain") { command = "$cxx {{ldflags}} $_start_group @$rspfile {{solibs}} $_end_group {{libs}} -o $exe_name" } - outputs = [ - "$exe_name", - ] + outputs = [ "$exe_name" ] if (is_ios) { outputs += [ "{{root_out_dir}}/{{target_output_name}}.dSYM" ] } diff --git a/skia/gn/utils.gni b/skia/gn/utils.gni index 3c6eaf367120e38c9a335cf32c77ef3e24cbc7ca..d140a29067eaecef843b27fb6d8b8d4287d4ad36 100644 --- a/skia/gn/utils.gni +++ b/skia/gn/utils.gni @@ -35,8 +35,8 @@ skia_utils_sources = [ "$_src/utils/SkBitSet.h", "$_src/utils/SkCallableTraits.h", "$_src/utils/SkCamera.cpp", - "$_src/utils/SkCanvasStack.h", "$_src/utils/SkCanvasStack.cpp", + "$_src/utils/SkCanvasStack.h", "$_src/utils/SkCanvasStateUtils.cpp", "$_src/utils/SkCharToGlyphCache.cpp", "$_src/utils/SkCharToGlyphCache.h", @@ -70,8 +70,8 @@ skia_utils_sources = [ "$_src/utils/SkShadowTessellator.cpp", "$_src/utils/SkShadowTessellator.h", "$_src/utils/SkShadowUtils.cpp", - "$_src/utils/SkShaperJSONWriter.h", "$_src/utils/SkShaperJSONWriter.cpp", + "$_src/utils/SkShaperJSONWriter.h", "$_src/utils/SkTextUtils.cpp", "$_src/utils/SkThreadUtils_pthread.cpp", "$_src/utils/SkThreadUtils_win.cpp", @@ -84,19 +84,19 @@ skia_utils_sources = [ "$_src/utils/mac/SkUniqueCFRef.h", #windows - "$_src/utils/win/SkAutoCoInitialize.h", "$_src/utils/win/SkAutoCoInitialize.cpp", - "$_src/utils/win/SkDWrite.h", + "$_src/utils/win/SkAutoCoInitialize.h", "$_src/utils/win/SkDWrite.cpp", + "$_src/utils/win/SkDWrite.h", "$_src/utils/win/SkDWriteFontFileStream.cpp", "$_src/utils/win/SkDWriteFontFileStream.h", "$_src/utils/win/SkDWriteGeometrySink.cpp", "$_src/utils/win/SkDWriteGeometrySink.h", "$_src/utils/win/SkDWriteNTDDI_VERSION.h", - "$_src/utils/win/SkHRESULT.h", "$_src/utils/win/SkHRESULT.cpp", - "$_src/utils/win/SkIStream.h", + "$_src/utils/win/SkHRESULT.h", "$_src/utils/win/SkIStream.cpp", + "$_src/utils/win/SkIStream.h", "$_src/utils/win/SkObjBase.h", "$_src/utils/win/SkTScopedComPtr.h", "$_src/utils/win/SkWGL.h", diff --git a/skia/gn/xps.gni b/skia/gn/xps.gni index 48b054c3edd94b503093c1c322999c377ff441b3..d18e550456fc6ff95e391304b372f9d418387886 100644 --- a/skia/gn/xps.gni +++ b/skia/gn/xps.gni @@ -7,13 +7,11 @@ _src = get_path_info("../src", "abspath") _include = get_path_info("../include", "abspath") -skia_xps_public = [ - "$_include/docs/SkXPSDocument.h", -] +skia_xps_public = [ "$_include/docs/SkXPSDocument.h" ] skia_xps_sources = [ "$_include/docs/SkXPSDocument.h", - "$_src/xps/SkXPSDocument.cpp", "$_src/xps/SkXPSDevice.cpp", "$_src/xps/SkXPSDevice.h", + "$_src/xps/SkXPSDocument.cpp", ] diff --git a/skia/modules/particles/BUILD.gn b/skia/modules/particles/BUILD.gn index 1573b72ee9f07aec7a4bc9067cda6e34d0200c4c..7ee0e47a5920d2f8686577073106244eedd8325a 100644 --- a/skia/modules/particles/BUILD.gn +++ b/skia/modules/particles/BUILD.gn @@ -20,9 +20,7 @@ static_library("particles") { import("particles.gni") public_configs = [ ":public_config" ] include_dirs = [ "../../tools/timer" ] - deps = [ - "../..:skia", - ] + deps = [ "../..:skia" ] sources = skia_particle_sources configs += [ "../../:skia_private" ] if (skia_enable_tools) { diff --git a/skia/modules/skottie/BUILD.gn b/skia/modules/skottie/BUILD.gn index c9703cbfc0ec106bcbda151501ea7d138c8776a4..c4783e6cb007d5ea40783eae558fa5004a5a7b3a 100644 --- a/skia/modules/skottie/BUILD.gn +++ b/skia/modules/skottie/BUILD.gn @@ -40,9 +40,7 @@ if (skia_enable_skottie) { public_configs = [ ":utils_config" ] configs += [ "../../:skia_private" ] - sources = [ - "utils/SkottieUtils.cpp", - ] + sources = [ "utils/SkottieUtils.cpp" ] deps = [ ":skottie", "../..:skia", @@ -57,9 +55,7 @@ if (skia_enable_skottie) { "../..:skia_private", "../..:tests_config", ] - sources = [ - "src/SkottieTest.cpp", - ] + sources = [ "src/SkottieTest.cpp" ] deps = [ ":skottie", @@ -92,9 +88,7 @@ if (skia_enable_skottie) { "../..:skia", ] - public_deps = [ - ":skottie", - ] + public_deps = [ ":skottie" ] } source_set("tool") { @@ -102,9 +96,7 @@ if (skia_enable_skottie) { testonly = true configs += [ "../..:skia_private" ] - sources = [ - "src/SkottieTool.cpp", - ] + sources = [ "src/SkottieTool.cpp" ] deps = [ "../..:flags", diff --git a/skia/modules/skottie/skottie.gni b/skia/modules/skottie/skottie.gni index ee659a4314ab4e807ac2324e25db527e48384765..a7b27083c8faaabe0aef60bd97d77f3d1b29d0e0 100644 --- a/skia/modules/skottie/skottie.gni +++ b/skia/modules/skottie/skottie.gni @@ -25,7 +25,6 @@ skia_skottie_sources = [ "$_src/SkottieProperty.cpp", "$_src/SkottieValue.cpp", "$_src/SkottieValue.h", - "$_src/effects/DropShadowEffect.cpp", "$_src/effects/Effects.cpp", "$_src/effects/Effects.h", @@ -43,14 +42,12 @@ skia_skottie_sources = [ "$_src/effects/TransformEffect.cpp", "$_src/effects/TritoneEffect.cpp", "$_src/effects/VenetianBlindsEffect.cpp", - "$_src/layers/ImageLayer.cpp", "$_src/layers/NullLayer.cpp", "$_src/layers/PrecompLayer.cpp", "$_src/layers/ShapeLayer.cpp", "$_src/layers/SolidLayer.cpp", "$_src/layers/TextLayer.cpp", - "$_src/text/RangeSelector.cpp", "$_src/text/RangeSelector.h", "$_src/text/SkottieShaper.cpp", diff --git a/skia/modules/skparagraph/BUILD.gn b/skia/modules/skparagraph/BUILD.gn index 5a85d37c4ededf5ad799dacc1fe4dc340ccf2c02..708ad4bc65accf39258acd63accd9fa02163937f 100644 --- a/skia/modules/skparagraph/BUILD.gn +++ b/skia/modules/skparagraph/BUILD.gn @@ -56,9 +56,7 @@ if (skia_enable_skparagraph) { source_set("tests") { if (skia_use_icu && skia_use_harfbuzz && paragraph_tests_enabled) { testonly = true - sources = [ - "//tests/SkParagraphTest.cpp", - ] + sources = [ "//tests/SkParagraphTest.cpp" ] deps = [ ":skparagraph", "../..:gpu_tool_utils", @@ -72,9 +70,7 @@ if (skia_enable_skparagraph) { source_set("bench") { if (skia_use_icu && skia_use_harfbuzz && paragraph_bench_enabled) { testonly = true - sources = [ - "//bench/ParagraphBench.cpp", - ] + sources = [ "//bench/ParagraphBench.cpp" ] deps = [ ":skparagraph", "../..:skia", @@ -87,9 +83,7 @@ if (skia_enable_skparagraph) { source_set("samples") { if (skia_use_icu && skia_use_harfbuzz) { testonly = true - sources = [ - "//samplecode/SampleParagraph.cpp", - ] + sources = [ "//samplecode/SampleParagraph.cpp" ] deps = [ ":skparagraph", ":utils", diff --git a/skia/modules/skparagraph/skparagraph.gni b/skia/modules/skparagraph/skparagraph.gni index f127d6819745ca3519c5cf0a179a6c165985b0fb..275296c33e8366f3062cd8cb0732463d2ba9d76f 100644 --- a/skia/modules/skparagraph/skparagraph.gni +++ b/skia/modules/skparagraph/skparagraph.gni @@ -20,23 +20,23 @@ skparagraph_public = [ skparagraph_sources = [ "$_src/FontCollection.cpp", - "$_src/FontResolver.h", "$_src/FontResolver.cpp", + "$_src/FontResolver.h", "$_src/Iterators.h", - "$_src/ParagraphBuilderImpl.h", "$_src/ParagraphBuilderImpl.cpp", + "$_src/ParagraphBuilderImpl.h", "$_src/ParagraphCache.cpp", - "$_src/ParagraphImpl.h", "$_src/ParagraphImpl.cpp", + "$_src/ParagraphImpl.h", "$_src/ParagraphStyle.cpp", - "$_src/Run.h", "$_src/Run.cpp", - "$_src/TextLine.h", + "$_src/Run.h", "$_src/TextLine.cpp", + "$_src/TextLine.h", "$_src/TextShadow.cpp", "$_src/TextStyle.cpp", - "$_src/TextWrapper.h", "$_src/TextWrapper.cpp", + "$_src/TextWrapper.h", "$_src/TypefaceFontProvider.cpp", "$_utils/TestFontCollection.cpp", ] diff --git a/skia/modules/sksg/BUILD.gn b/skia/modules/sksg/BUILD.gn index 93845f6c96adcd46737042dc34b3832a94871730..3bf998b1739923d44b2af4f82ebb8252ec44ab5e 100644 --- a/skia/modules/sksg/BUILD.gn +++ b/skia/modules/sksg/BUILD.gn @@ -15,9 +15,7 @@ component("sksg") { public_configs = [ ":public_config" ] sources = skia_sksg_sources configs += [ "../../:skia_private" ] - deps = [ - "../..:skia", - ] + deps = [ "../..:skia" ] } if (defined(is_skia_standalone) && skia_enable_tools) { @@ -28,9 +26,7 @@ if (defined(is_skia_standalone) && skia_enable_tools) { "../..:skia_private", "../..:tests_config", # TODO: refactor to make this nicer ] - sources = [ - "tests/SGTest.cpp", - ] + sources = [ "tests/SGTest.cpp" ] deps = [ ":sksg", "../..:gpu_tool_utils", # TODO: refactor to make this nicer @@ -46,9 +42,7 @@ if (defined(is_skia_standalone) && skia_enable_tools) { "../..:skia_private", "../..:samples_config", # TODO: refactor to make this nicer ] - sources = [ - "samples/SampleSVGPong.cpp", - ] + sources = [ "samples/SampleSVGPong.cpp" ] deps = [ ":sksg", "../..:samples", diff --git a/skia/modules/skshaper/BUILD.gn b/skia/modules/skshaper/BUILD.gn index a672d984fb5aabca976b9cb8f7c81576692b36d6..f5074fa61513bc4340e9313f0846ebd44ce0f773 100644 --- a/skia/modules/skshaper/BUILD.gn +++ b/skia/modules/skshaper/BUILD.gn @@ -23,9 +23,7 @@ if (skia_enable_skshaper) { import("skshaper.gni") public_configs = [ ":public_config" ] public = skia_shaper_public - deps = [ - "../..:skia", - ] + deps = [ "../..:skia" ] sources = skia_shaper_primitive_sources if (skia_use_icu && skia_use_harfbuzz) { sources += skia_shaper_harfbuzz_sources diff --git a/skia/src/ports/SkFontMgr_ohos.cpp b/skia/src/ports/SkFontMgr_ohos.cpp index 26e7991d6721d1ff0bd380b56545d555d740324d..b484237df87614a23006597bd04e6292b0cc6257 100644 --- a/skia/src/ports/SkFontMgr_ohos.cpp +++ b/skia/src/ports/SkFontMgr_ohos.cpp @@ -10,7 +10,6 @@ #include "src/ports/SkFontMgr_ohos.h" SkFontMgr_OHOS::BuildFamilyMapCallback SkFontMgr_OHOS::buildFamilyMapCallback; -SkFontMgr_OHOS::GetAliasesCallback SkFontMgr_OHOS::getAliasesCallback; SkFontMgr_OHOS::SkFontMgr_OHOS() { @@ -49,14 +48,9 @@ SkFontStyleSet* SkFontMgr_OHOS::onMatchFamily(const char familyName[]) const std::transform(familyNameStr.begin(), familyNameStr.end(), familyNameStr.begin(), [](unsigned char c) -> unsigned char { return std::tolower(c); }); - if (!getAliasesCallback) { - return nullptr; - } - std::map aliasMap; - getAliasesCallback(aliasMap); std::string aliasTo; - const auto& iter = aliasMap.find(familyNameStr); - if (iter != aliasMap.end()) { + const auto& iter = fAliasMap.find(familyNameStr); + if (iter != fAliasMap.end()) { aliasTo = iter->second.toName; } for (int i = 0; i < fNameToFamilyMap.count(); ++i) { @@ -168,6 +162,44 @@ SkString SkFontMgr_OHOS::find_family_style_character_ohos(const SkString& family return SkString(); } +SkString SkFontMgr_OHOS::find_family_style_character_hwfont( + const SkString &familyName, + const SkTArray &fallbackNameToFamilyMap, + const SkFontStyle &style, bool elegant, const SkString &langTag, + SkUnichar character) { + SkString matchingName = + findFromHwFontCache(familyName, style, elegant, langTag, character); + if (!matchingName.isEmpty()) { + return matchingName; + } + + // First find in HwThemeFont. + for (int i = 0; i < fallbackNameToFamilyMap.count(); ++i) { + SkFontStyleSet_OHOS *family = fallbackNameToFamilyMap[i].styleSet; + if (family->getHwFontFamilyType() > 0) { + SkTypeface *face = family->matchStyle(style); + if (!face) { + SkDEBUGF("face is null"); + continue; + } + + if (!family->matchLanguage(langTag)) { + continue; + } + + if (family->haveVariant(kElegant_FontVariant) != elegant) { + continue; + } + + if (face->unicharToGlyph(character) != 0) { + addToHwFontCache(&(fallbackNameToFamilyMap[i])); + return fallbackNameToFamilyMap[i].name; + } + } + } + return SkString(); +} + SkString SkFontMgr_OHOS::findFromCache(const SkString& familyName, const SkFontStyle& style, bool elegant, const SkString& langTag, SkUnichar character) { @@ -207,6 +239,45 @@ void SkFontMgr_OHOS::addToCache(const NameToFamily* item) familyMapCache.emplace_back(item); } +SkString SkFontMgr_OHOS::findFromHwFontCache(const SkString& familyName, const SkFontStyle& style, bool elegant, + const SkString& langTag, SkUnichar character) +{ + std::lock_guard lock(mutexCache); + for (int i = 0; i < hwFontFamilyMapCache.count(); ++i) { + SkFontStyleSet_OHOS* family = hwFontFamilyMapCache[i]->styleSet; + // TODO: process fallbackFor + SkTypeface* face = family->matchStyle(style); + if (!face) { + SkDEBUGF("face is null"); + continue; + } + + if (!family->matchLanguage(langTag)) { + continue; + } + + if (family->haveVariant(kElegant_FontVariant) != elegant) { + continue; + } + + if (face->unicharToGlyph(character) != 0) { + return hwFontFamilyMapCache[i]->name; + } + } + return SkString(); +} + +void SkFontMgr_OHOS::addToHwFontCache(const NameToFamily* item) +{ + std::lock_guard lock(mutexCache); + for (int i = 0; i < hwFontFamilyMapCache.count(); ++i) { + if (item == hwFontFamilyMapCache[i]) { + return; + } + } + hwFontFamilyMapCache.emplace_back(item); +} + SkTypeface* SkFontMgr_OHOS::onMatchFamilyStyleCharacter( const char familyName[], const SkFontStyle& style, const char* bcp47[], int bcp47Count, SkUnichar character) const { @@ -261,6 +332,32 @@ SkString SkFontMgr_OHOS::onMatchFamilyStyleCharacterOHOS( return SkString(); } +SkString SkFontMgr_OHOS::onMatchFamilyStyleCharacterHwFont( + const char familyName[], const SkFontStyle& style, const char* bcp47[], int bcp47Count, SkUnichar character) +{ + SkString familyNameString(familyName); + for (const SkString& currentFamilyName : { familyNameString, SkString() }) { + // The first time match anything elegant, second time anything not elegant. + for (int bcp47Index = bcp47Count; bcp47Index-- > 0;) { + SkLanguage lang(bcp47[bcp47Index]); + while (!lang.getTag().isEmpty()) { + SkString matchingName = find_family_style_character_hwfont( + currentFamilyName, fFallbackNameToFamilyMap, style, false, lang.getTag(), character); + if (!matchingName.isEmpty()) { + return matchingName; + } + lang = lang.getParent(); + } + } + SkString matchingName = find_family_style_character_hwfont( + currentFamilyName, fFallbackNameToFamilyMap, style, false, SkString(), character); + if (!matchingName.isEmpty()) { + return matchingName; + } + } + return SkString(); +} + sk_sp SkFontMgr_OHOS::onMakeFromData(sk_sp data, int ttcIndex) const { return this->makeFromStream(std::unique_ptr(new SkMemoryStream(std::move(data))), ttcIndex); @@ -302,7 +399,7 @@ sk_sp SkFontMgr_OHOS::onLegacyMakeTypeface(const char familyName[], void SkFontMgr_OHOS::buildNameToFamilyMap() { if (buildFamilyMapCallback) { - buildFamilyMapCallback(fNameToFamilyMap, fFallbackNameToFamilyMap, fStyleSets); + buildFamilyMapCallback(fNameToFamilyMap, fFallbackNameToFamilyMap, fStyleSets, fAliasMap); } } diff --git a/skia/src/ports/SkFontMgr_ohos.h b/skia/src/ports/SkFontMgr_ohos.h index e0353c86def582834ff227424ff5f0be93788491..2fd196d64b754da22e9fde8f92bf76b21b816f9e 100644 --- a/skia/src/ports/SkFontMgr_ohos.h +++ b/skia/src/ports/SkFontMgr_ohos.h @@ -44,6 +44,7 @@ struct FontFamilyItem { int index; int variant; std::vector variationAxes; + int hwFontFamilyType; }; struct FamilyAliasObj { @@ -58,13 +59,15 @@ public: const std::string& lang, FontVariant variantStyle, const std::vector& variationAxes, - int fontWeight) + int fontWeight, + int hwFontFamilyType) : fTypeface(typeface) , fLang(lang) , fVariantStyle(variantStyle) , fFamilyName(familyName.c_str()) , variationAxes(variationAxes) , fontWeight(fontWeight) + , hwFontFamilyType(hwFontFamilyType) { } ~SkTypeface_OHOS() override = default; @@ -98,6 +101,10 @@ public: return fLang; } + int getHwFontFamilyType() const { + return hwFontFamilyType; + } + protected: SkTypeface* fTypeface = nullptr; std::string fLang; @@ -105,6 +112,7 @@ protected: SkString fFamilyName; std::vector variationAxes; int fontWeight = 400; // default font weight is 400. + int hwFontFamilyType = 0; }; class SkLanguage { @@ -173,8 +181,9 @@ public: variationAxis.push_back({ .tag = variationAxes.tag, .value = variationAxes.value }); } } - fStylesHost.push_back().reset( - new SkTypeface_OHOS(item.typeface, familyName, item.lang, item.variant, variationAxis, fontWeight)); + fStylesHost.push_back().reset(new SkTypeface_OHOS( + item.typeface, familyName, item.lang, item.variant, + variationAxis, fontWeight, item.hwFontFamilyType)); } } @@ -240,6 +249,13 @@ public: return false; } + int getHwFontFamilyType() { + if (fStylesHost.count() <= 0) { + return 0; + } + return fStylesHost[0]->getHwFontFamilyType(); + } + private: SkTArray> fStyles; SkTArray> fStylesHost; @@ -262,8 +278,8 @@ class SkFontMgr_OHOS : public SkFontMgr { public: using BuildFamilyMapCallback = std::function&, SkTArray&, - SkTArray>&)>; - using GetAliasesCallback = std::function&)>; + SkTArray>&, + std::map&)>; SkFontMgr_OHOS(); ~SkFontMgr_OHOS() override = default; @@ -274,14 +290,16 @@ public: int bcp47Count, SkUnichar character); + SkString onMatchFamilyStyleCharacterHwFont(const char familyName[], + const SkFontStyle& style, + const char* bcp47[], + int bcp47Count, + SkUnichar character); + static void setBuildFamilyMapCallback(BuildFamilyMapCallback&& callback) { buildFamilyMapCallback = std::move(callback); } - static void setGetAliasesCallback(GetAliasesCallback&& callback) { - getAliasesCallback = std::move(callback); - } - protected: int onCountFamilies() const override; void onGetFamilyName(int index, SkString* familyName) const override; @@ -316,23 +334,33 @@ private: void buildNameToFamilyMap(); void findDefaultStyleSet(); static BuildFamilyMapCallback buildFamilyMapCallback; - static GetAliasesCallback getAliasesCallback; SkString find_family_style_character_ohos( const SkString& familyName, const SkTArray& fallbackNameToFamilyMap, const SkFontStyle& style, bool elegant, const SkString& langTag, SkUnichar character); + SkString find_family_style_character_hwfont( + const SkString& familyName, + const SkTArray& fallbackNameToFamilyMap, + const SkFontStyle& style, bool elegant, + const SkString& langTag, SkUnichar character); void addToCache(const NameToFamily* item); SkString findFromCache(const SkString& familyName, const SkFontStyle& style, bool elegant, const SkString& langTag, SkUnichar character); + void addToHwFontCache(const NameToFamily* item); + SkString findFromHwFontCache(const SkString& familyName, const SkFontStyle& style, bool elegant, + const SkString& langTag, SkUnichar character); + SkTArray> fStyleSets; sk_sp fDefaultStyleSet; std::mutex mutexCache; SkTArray familyMapCache; + SkTArray hwFontFamilyMapCache; SkTArray fNameToFamilyMap; SkTArray fFallbackNameToFamilyMap; + std::map fAliasMap; typedef SkFontMgr INHERITED; }; diff --git a/skia/third_party/angle2/BUILD.gn b/skia/third_party/angle2/BUILD.gn index 9b6ab3b1d9257763cf2332e8e5e63c1d7a25055e..9aff0c766f04e81af1e06834162ff56742f8ed4d 100644 --- a/skia/third_party/angle2/BUILD.gn +++ b/skia/third_party/angle2/BUILD.gn @@ -8,9 +8,9 @@ declare_args() { angle_root = "../externals/angle2" -import("../third_party.gni") import("$angle_root/src/compiler.gni") import("$angle_root/src/libGLESv2.gni") +import("../third_party.gni") third_party("angle2") { public_include_dirs = [ "$angle_root/include" ] @@ -71,12 +71,8 @@ config("common") { } copy("commit_id") { - sources = [ - "$angle_root/src/commit.h", - ] - outputs = [ - "$root_gen_dir/angle2/id/commit.h", - ] + sources = [ "$angle_root/src/commit.h" ] + outputs = [ "$root_gen_dir/angle2/id/commit.h" ] } shared_library("libGLESv2") { @@ -86,9 +82,7 @@ shared_library("libGLESv2") { "LIBANGLE_IMPLEMENTATION", "LIBGLESV2_IMPLEMENTATION", ] - deps = [ - ":commit_id", - ] + deps = [ ":commit_id" ] libs = [] sources = rebase_path( @@ -137,9 +131,7 @@ shared_library("libEGL") { configs += [ ":common" ] configs -= [ "//gn:warnings" ] defines = [ "LIBEGL_IMPLEMENTATION" ] - deps = [ - ":libGLESv2", - ] + deps = [ ":libGLESv2" ] sources = rebase_path(libegl_sources, ".", angle_root) if (is_win) { sources += [ "$angle_root/src/libEGL/libEGL.def" ] diff --git a/skia/third_party/cpu-features/BUILD.gn b/skia/third_party/cpu-features/BUILD.gn index d1f6fad089b5bcbbaf2219972133a6f221e441cc..9bded0a83396682eb5f3de10fe53f1cfc0ccf0ec 100644 --- a/skia/third_party/cpu-features/BUILD.gn +++ b/skia/third_party/cpu-features/BUILD.gn @@ -11,7 +11,5 @@ import("../third_party.gni") third_party("cpu-features") { public_include_dirs = [ "$ndk/sources/android/cpufeatures" ] - sources = [ - "$ndk/sources/android/cpufeatures/cpu-features.c", - ] + sources = [ "$ndk/sources/android/cpufeatures/cpu-features.c" ] } diff --git a/skia/third_party/dawn/BUILD.gn b/skia/third_party/dawn/BUILD.gn index 4247f505d9c7830d082e8178fa0db3db34a9e58b..7f93ad2f06b665837c535ae604030ca4c11c8938 100644 --- a/skia/third_party/dawn/BUILD.gn +++ b/skia/third_party/dawn/BUILD.gn @@ -13,8 +13,8 @@ # limitations under the License. dawn_root = "../externals/dawn" -import("$dawn_root/scripts/dawn_features.gni") import("$dawn_root/generator/dawn_generator.gni") +import("$dawn_root/scripts/dawn_features.gni") ############################################################################### # Template to wrap the Dawn code generator @@ -108,9 +108,7 @@ static_library("dawn_common") { "$dawn_root") configs += [ ":dawn_internal" ] - deps = [ - ":dawn_headers", - ] + deps = [ ":dawn_headers" ] } ############################################################################### @@ -127,9 +125,7 @@ dawn_json_generator("dawn_headers_gen") { source_set("dawn_headers") { public_configs = [ ":libdawn_public" ] - deps = [ - ":dawn_headers_gen", - ] + deps = [ ":dawn_headers_gen" ] sources = get_target_outputs(":dawn_headers_gen") sources += [ @@ -148,14 +144,10 @@ dawn_json_generator("libdawn_gen") { } static_library("libdawn") { - public_deps = [ - ":dawn_headers", - ] + public_deps = [ ":dawn_headers" ] defines = [ "DAWN_IMPLEMENTATION" ] - deps = [ - ":libdawn_gen", - ] + deps = [ ":libdawn_gen" ] sources = get_target_outputs(":libdawn_gen") } @@ -202,9 +194,7 @@ if (dawn_enable_opengl) { # Public libdawn_native headers so they can be publically visible for # dependencies of libdawn_native source_set("libdawn_native_headers") { - public_deps = [ - ":dawn_headers", - ] + public_deps = [ ":dawn_headers" ] sources = rebase_path( [ "src/include/dawn_native/DawnNative.h", @@ -236,9 +226,7 @@ source_set("libdawn_native_sources") { public_configs = [ ":libdawn_native_internal" ] # Set the headers as a public dependency so they are visible to unittests - public_deps = [ - ":libdawn_native_headers", - ] + public_deps = [ ":libdawn_native_headers" ] libs = [] @@ -551,14 +539,10 @@ source_set("libdawn_native_sources") { # The shared library for libdawn_native for use by samples, tests, etc. shared_library("libdawn_native") { - deps = [ - ":libdawn_native_sources", - ] + deps = [ ":libdawn_native_sources" ] #Make headers publically visible - public_deps = [ - ":libdawn_native_headers", - ] + public_deps = [ ":libdawn_native_headers" ] public_configs = [ ":libdawn_public" ] # Tell dependents where to find this shared library diff --git a/skia/third_party/dawn/third_party/BUILD.gn b/skia/third_party/dawn/third_party/BUILD.gn index 0ce069276911ef45dcede04048d6e27b9587c99f..92c0ab15027186482c600e9fe4d5c20cdfb0afd2 100644 --- a/skia/third_party/dawn/third_party/BUILD.gn +++ b/skia/third_party/dawn/third_party/BUILD.gn @@ -61,9 +61,7 @@ source_set("vulkan_headers") { } source_set("khronos_platform") { - sources = [ - "khronos/KHR/khrplatform.h", - ] + sources = [ "khronos/KHR/khrplatform.h" ] public_configs = [ ":khronos_headers_public" ] } @@ -90,9 +88,7 @@ template("spvtools_core_tables") { operand_kinds_file = "${target_gen_dir}/operand.kinds-$version.inc" extinst_file = "${spirv_tools}/source/extinst.debuginfo.grammar.json" - sources = [ - core_json_file, - ] + sources = [ core_json_file ] outputs = [ core_insts_file, operand_kinds_file, @@ -134,9 +130,7 @@ template("spvtools_core_enums") { "--enum-string-mapping-output", rebase_path(extension_map_file, root_build_dir), ] - inputs = [ - core_json_file, - ] + inputs = [ core_json_file ] outputs = [ extension_enum_file, extension_map_file, @@ -172,9 +166,7 @@ template("spvtools_glsl_tables") { core_json_file, glsl_json_file, ] - outputs = [ - glsl_insts_file, - ] + outputs = [ glsl_insts_file ] } } @@ -206,9 +198,7 @@ template("spvtools_opencl_tables") { core_json_file, opengl_json_file, ] - outputs = [ - opencl_insts_file, - ] + outputs = [ opencl_insts_file ] } } @@ -230,12 +220,8 @@ template("spvtools_language_header") { "--extinst-output-base", rebase_path(extinst_output_base, root_build_dir), ] - inputs = [ - debug_insts_file, - ] - outputs = [ - "${extinst_output_base}.h", - ] + inputs = [ debug_insts_file ] + outputs = [ "${extinst_output_base}.h" ] } } @@ -256,12 +242,8 @@ template("spvtools_vendor_table") { "--vendor-insts-output", rebase_path(extinst_file, root_build_dir), ] - inputs = [ - extinst_vendor_grammar, - ] - outputs = [ - extinst_file, - ] + inputs = [ extinst_vendor_grammar ] + outputs = [ extinst_file ] } } @@ -272,12 +254,8 @@ action("spvtools_generators_inc") { xml_file = "${spirv_headers}/include/spirv/spir-v.xml" inc_file = "${target_gen_dir}/generators.inc" - sources = [ - xml_file, - ] - outputs = [ - inc_file, - ] + sources = [ xml_file ] + outputs = [ inc_file ] args = [ "--xml", rebase_path(xml_file, root_build_dir), @@ -292,9 +270,7 @@ action("spvtools_build_version") { src_dir = "${spirv_tools}" inc_file = "${target_gen_dir}/build-version.inc" - outputs = [ - inc_file, - ] + outputs = [ inc_file ] args = [ rebase_path(src_dir, root_build_dir), rebase_path(inc_file, root_build_dir), @@ -437,9 +413,7 @@ static_library("spvtools") { ".", "$dawn_thirdparty_root/SPIRV-Tools") - public_deps = [ - ":spvtools_headers", - ] + public_deps = [ ":spvtools_headers" ] configs += [ ":spvtools_internal_config" ] } @@ -491,12 +465,8 @@ static_library("spvtools_val") { ".", "${spirv_tools}") - deps = [ - ":spvtools", - ] - public_deps = [ - ":spvtools_headers", - ] + deps = [ ":spvtools" ] + public_deps = [ ":spvtools_headers" ] configs += [ ":spvtools_internal_config" ] } @@ -677,12 +647,8 @@ static_library("spvtools_opt") { ".", "${spirv_tools}") - deps = [ - ":spvtools", - ] - public_deps = [ - ":spvtools_headers", - ] + deps = [ ":spvtools" ] + public_deps = [ ":spvtools_headers" ] configs += [ ":spvtools_internal_config" ] } diff --git a/skia/third_party/externals/angle2/BUILD.gn b/skia/third_party/externals/angle2/BUILD.gn index 464ab6514e8d7c36abca6a9138e1d0e2a7833a66..ff3f386bea48f32418d91d5560164cb48c65facf 100644 --- a/skia/third_party/externals/angle2/BUILD.gn +++ b/skia/third_party/externals/angle2/BUILD.gn @@ -167,17 +167,13 @@ if (is_win && target_cpu != "arm64") { exec_script("scripts/file_exists.py", [ _old_compiler ], "value") copy("copy_compiler_dll") { - sources = [ - "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll", - ] + sources = [ "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll" ] if (_has_old_compiler) { sources += [ _old_compiler ] } - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } } @@ -194,9 +190,7 @@ angle_source_set("includes") { angle_static_library("preprocessor") { sources = angle_preprocessor_sources - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] } config("angle_disable_pool_alloc") { @@ -251,12 +245,8 @@ angle_source_set("xxhash") { } fuzzer_test("xxhash_fuzzer") { - sources = [ - "src/common/third_party/xxhash/xxhash_fuzzer.cpp", - ] - deps = [ - ":xxhash", - ] + sources = [ "src/common/third_party/xxhash/xxhash_fuzzer.cpp" ] + deps = [ ":xxhash" ] } angle_static_library("angle_common") { @@ -267,9 +257,7 @@ angle_static_library("angle_common") { ":debug_annotations_config", ] - deps = [ - ":xxhash", - ] + deps = [ ":xxhash" ] public_deps = [ ":angle_system_utils", @@ -293,9 +281,7 @@ config("angle_image_util_config") { angle_static_library("angle_image_util") { sources = libangle_image_util_sources public_configs += [ ":angle_image_util_config" ] - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] } config("angle_gl_visibility_config") { @@ -324,9 +310,7 @@ angle_static_library("angle_gpu_info_util") { ":angle_gpu_info_util_config", ":angle_backend_config", ] - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] sources = libangle_gpu_info_util_sources deps = [] libs = [] @@ -404,9 +388,7 @@ angle_static_library("translator") { ":preprocessor", ] - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] if (is_win) { # Necessary to suppress some system header xtree warnigns in Release. @@ -416,18 +398,14 @@ angle_static_library("translator") { } angle_source_set("translator_fuzzer") { - sources = [ - "src/compiler/fuzz/translator_fuzzer.cpp", - ] + sources = [ "src/compiler/fuzz/translator_fuzzer.cpp" ] include_dirs = [ "include", "src", ] - deps = [ - ":translator", - ] + deps = [ ":translator" ] } config("commit_id_config") { @@ -439,14 +417,10 @@ commit_id_output_file = "$root_gen_dir/angle/id/commit.h" if (angle_use_commit_id) { action("commit_id") { script = "src/commit_id.py" - outputs = [ - commit_id_output_file, - ] + outputs = [ commit_id_output_file ] # commit id should depend on angle's HEAD revision - inputs = [ - ".git/HEAD", - ] + inputs = [ ".git/HEAD" ] args = [ "gen", @@ -458,23 +432,15 @@ if (angle_use_commit_id) { } } else { copy("commit_id") { - sources = [ - "src/commit.h", - ] - outputs = [ - commit_id_output_file, - ] + sources = [ "src/commit.h" ] + outputs = [ commit_id_output_file ] public_configs = [ ":commit_id_config" ] } } angle_source_set("angle_version") { - sources = [ - "src/common/version.h", - ] - public_deps = [ - ":commit_id", - ] + sources = [ "src/common/version.h" ] + public_deps = [ ":commit_id" ] } config("angle_backend_config") { @@ -517,7 +483,8 @@ config("libANGLE_config") { defines += [ "LIBANGLE_IMPLEMENTATION" ] if (is_win) { - cflags += [ "/wd4530" ] # C++ exception handler used, but unwind semantics are not enabled. + cflags += [ "/wd4530" ] # C++ exception handler used, but unwind semantics + # are not enabled. } if (is_android && (angle_enable_gl || angle_enable_vulkan)) { @@ -540,15 +507,11 @@ if (angle_enable_vulkan) { # Use this target to include everything ANGLE needs for Vulkan. group("angle_vulkan") { - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] public_configs = [ ":vulkan_config" ] data_deps = [] if (!is_android && !is_fuchsia) { - deps = [ - "$angle_root/third_party/vulkan-loader:libvulkan", - ] + deps = [ "$angle_root/third_party/vulkan-loader:libvulkan" ] data_deps += [ "$angle_root/third_party/vulkan-tools:VkICD_mock_icd" ] public_configs += [ "$angle_root/third_party/vulkan-loader:vulkan_loader_config" ] @@ -563,9 +526,7 @@ if (angle_enable_vulkan) { if (angle_enable_vulkan_validation_layers) { if (is_fuchsia) { - deps = [ - "//third_party/fuchsia-sdk:vulkan_validation", - ] + deps = [ "//third_party/fuchsia-sdk:vulkan_validation" ] } else { data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers" ] if (!is_android) { @@ -718,9 +679,7 @@ angle_source_set("libANGLE_base") { # Windows ARM64 is available since 10.0.16299 so no need to copy # d3dcompiler_47.dll because this file is available as inbox. if (is_win && target_cpu != "arm64") { - data_deps = [ - ":copy_compiler_dll", - ] + data_deps = [ ":copy_compiler_dll" ] } } @@ -733,13 +692,9 @@ config("angle_frame_capture_enabled") { } angle_source_set("libANGLE") { - public_deps = [ - ":libANGLE_base", - ] + public_deps = [ ":libANGLE_base" ] public_configs = [ ":angle_frame_capture_disabled" ] - sources = [ - "src/libANGLE/FrameCapture.cpp", - ] + sources = [ "src/libANGLE/FrameCapture.cpp" ] # gl_enum_utils defaults included in with_capture build if (angle_enable_trace || is_debug) { @@ -748,9 +703,7 @@ angle_source_set("libANGLE") { } angle_source_set("libANGLE_with_capture") { - public_deps = [ - ":libANGLE_base", - ] + public_deps = [ ":libANGLE_base" ] public_configs = [ ":angle_frame_capture_enabled" ] sources = libangle_capture_sources } @@ -809,16 +762,12 @@ template("angle_libGLESv2") { deps = invoker.deps + [ ":includes" ] - public_deps = [ - ":angle_version", - ] + public_deps = [ ":angle_version" ] } } angle_libGLESv2("libGLESv2") { - deps = [ - ":libANGLE", - ] + deps = [ ":libANGLE" ] if (angle_with_capture_by_default) { output_name = "libGLESv2_no_capture" @@ -826,9 +775,7 @@ angle_libGLESv2("libGLESv2") { } angle_libGLESv2("libGLESv2_with_capture") { - deps = [ - ":libANGLE_with_capture", - ] + deps = [ ":libANGLE_with_capture" ] if (!angle_with_capture_by_default) { output_name = "libGLESv2_with_capture" @@ -858,9 +805,7 @@ if (is_win) { ":libANGLE", ] - public_deps = [ - ":angle_version", - ] + public_deps = [ ":angle_version" ] } } @@ -868,12 +813,8 @@ angle_static_library("libGLESv2_static") { sources = libglesv2_sources configs += [ ":debug_annotations_config" ] public_configs += [ ":angle_static" ] - deps = [ - ":includes", - ] - public_deps = [ - ":libANGLE", - ] + deps = [ ":includes" ] + public_deps = [ ":libANGLE" ] } angle_shared_library("libGLESv1_CM") { @@ -919,9 +860,7 @@ angle_source_set("libEGL_egl_loader") { ":gl_prototypes", ] - deps = [ - ":includes", - ] + deps = [ ":includes" ] } angle_shared_library("libEGL") { @@ -951,13 +890,9 @@ angle_shared_library("libEGL") { ":libEGL_egl_loader", ] - public_deps = [ - ":includes", - ] + public_deps = [ ":includes" ] - data_deps = [ - ":libGLESv2", - ] + data_deps = [ ":libGLESv2" ] } angle_static_library("libEGL_static") { @@ -993,9 +928,7 @@ angle_source_set("angle_util_loader_headers") { sources += [ "util/windows/wgl_loader_autogen.h" ] } - public_deps = [ - ":includes", - ] + public_deps = [ ":includes" ] } angle_source_set("angle_util_loader") { @@ -1010,9 +943,7 @@ angle_source_set("angle_util_loader") { sources += [ "util/windows/wgl_loader_autogen.cpp" ] } - deps = [ - ":angle_util_loader_headers", - ] + deps = [ ":angle_util_loader_headers" ] public_configs += [ ":angle_util_config", @@ -1137,13 +1068,9 @@ foreach(is_shared_library, angle_executable("angle_shader_translator") { testonly = true - sources = [ - "samples/shader_translator/shader_translator.cpp", - ] + sources = [ "samples/shader_translator/shader_translator.cpp" ] - deps = [ - ":translator", - ] + deps = [ ":translator" ] } config("angle_feature_support_config") { @@ -1214,9 +1141,7 @@ if (!is_component_build && is_android && symbol_level != 0) { } } - outputs = [ - "$root_out_dir/lib.compressed/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/lib.compressed/{{source_file_part}}" ] android_nm = "${android_tool_prefix}nm" android_strip = "${android_tool_prefix}strip" @@ -1245,8 +1170,6 @@ if (!is_component_build && is_android && } group("angle_apks") { - deps = [ - ":angle_chromium_apk", - ] + deps = [ ":angle_chromium_apk" ] } } diff --git a/skia/third_party/externals/angle2/android/angle_apk.gni b/skia/third_party/externals/angle2/android/angle_apk.gni index da7af50aee0224133489f6798b850e519a543207..a136506fd0df1fd33bf3545d1ed6c6b1a35a8f67 100644 --- a/skia/third_party/externals/angle2/android/angle_apk.gni +++ b/skia/third_party/externals/angle2/android/angle_apk.gni @@ -31,9 +31,7 @@ template("angle_apk") { android_assets("${invoker.package_name}_assets") { disable_compression = true - sources = [ - "src/feature_support_util/a4a_rules.json", - ] + sources = [ "src/feature_support_util/a4a_rules.json" ] } android_apk(target_name) { @@ -42,9 +40,7 @@ template("angle_apk") { android_manifest_dep = ":$manifest_target_name" min_sdk_version = 26 target_sdk_version = 28 - deps = [ - ":${invoker.package_name}_assets", - ] + deps = [ ":${invoker.package_name}_assets" ] if (symbol_level != 0) { deps += [ ":compressed_symbols" ] if (build_apk_secondary_abi && android_64bit_target_cpu) { diff --git a/skia/third_party/externals/angle2/samples/BUILD.gn b/skia/third_party/externals/angle2/samples/BUILD.gn index faac6f3915ea760fc489bd8d5809550243c43c79..8f143a1c539be4f11e99feb9185bd82991cda8d0 100644 --- a/skia/third_party/externals/angle2/samples/BUILD.gn +++ b/skia/third_party/externals/angle2/samples/BUILD.gn @@ -5,13 +5,9 @@ import("../gni/angle.gni") angle_executable("shader_translator") { - sources = [ - "shader_translator/shader_translator.cpp", - ] + sources = [ "shader_translator/shader_translator.cpp" ] include_dirs = [ "../include" ] - deps = [ - "../:translator", - ] + deps = [ "../:translator" ] } config("sample_util_config") { @@ -48,16 +44,12 @@ template("angle_sample") { if (defined(invoker.data)) { copy(target_name + "_data") { sources = invoker.data - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } } angle_executable(target_name) { - deps = [ - ":sample_util", - ] + deps = [ ":sample_util" ] if (defined(invoker.data)) { deps += [ ":${target_name}_data" ] } @@ -66,21 +58,15 @@ template("angle_sample") { } angle_sample("hello_triangle") { - sources = [ - "hello_triangle/HelloTriangle.cpp", - ] + sources = [ "hello_triangle/HelloTriangle.cpp" ] } angle_sample("mip_map_2d") { - sources = [ - "mip_map_2d/MipMap2D.cpp", - ] + sources = [ "mip_map_2d/MipMap2D.cpp" ] } angle_sample("multi_texture") { - sources = [ - "multi_texture/MultiTexture.cpp", - ] + sources = [ "multi_texture/MultiTexture.cpp" ] data = [ "multi_texture/basemap.tga", "multi_texture/lightmap.tga", @@ -88,15 +74,11 @@ angle_sample("multi_texture") { } angle_sample("multi_window") { - sources = [ - "multi_window/MultiWindow.cpp", - ] + sources = [ "multi_window/MultiWindow.cpp" ] } angle_sample("multiple_draw_buffers") { - sources = [ - "multiple_draw_buffers/MultipleDrawBuffers.cpp", - ] + sources = [ "multiple_draw_buffers/MultipleDrawBuffers.cpp" ] data = [ "multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl", "multiple_draw_buffers/multiple_draw_buffers_fs.glsl", @@ -105,108 +87,72 @@ angle_sample("multiple_draw_buffers") { } angle_sample("multiview") { - sources = [ - "multiview/Multiview.cpp", - ] + sources = [ "multiview/Multiview.cpp" ] } angle_sample("particle_system") { - sources = [ - "particle_system/ParticleSystem.cpp", - ] - data = [ - "particle_system/smoke.tga", - ] + sources = [ "particle_system/ParticleSystem.cpp" ] + data = [ "particle_system/smoke.tga" ] } angle_sample("post_sub_buffer") { - sources = [ - "post_sub_buffer/PostSubBuffer.cpp", - ] + sources = [ "post_sub_buffer/PostSubBuffer.cpp" ] } angle_sample("simple_instancing") { - sources = [ - "simple_instancing/SimpleInstancing.cpp", - ] + sources = [ "simple_instancing/SimpleInstancing.cpp" ] } angle_sample("simple_texture_2d") { - sources = [ - "simple_texture_2d/SimpleTexture2D.cpp", - ] + sources = [ "simple_texture_2d/SimpleTexture2D.cpp" ] } angle_sample("simple_texture_cubemap") { - sources = [ - "simple_texture_cubemap/SimpleTextureCubemap.cpp", - ] + sources = [ "simple_texture_cubemap/SimpleTextureCubemap.cpp" ] } angle_sample("simple_vertex_shader") { - sources = [ - "simple_vertex_shader/SimpleVertexShader.cpp", - ] + sources = [ "simple_vertex_shader/SimpleVertexShader.cpp" ] } angle_sample("stencil_operations") { - sources = [ - "stencil_operations/StencilOperations.cpp", - ] + sources = [ "stencil_operations/StencilOperations.cpp" ] } angle_sample("tex_redef_microbench") { - sources = [ - "tex_redef_microbench/TexRedefMicroBench.cpp", - ] + sources = [ "tex_redef_microbench/TexRedefMicroBench.cpp" ] } angle_sample("texture_wrap") { - sources = [ - "texture_wrap/TextureWrap.cpp", - ] + sources = [ "texture_wrap/TextureWrap.cpp" ] } angle_sample("tri_fan_microbench") { - sources = [ - "tri_fan_microbench/TriFanMicroBench.cpp", - ] + sources = [ "tri_fan_microbench/TriFanMicroBench.cpp" ] } angle_sample("window_test") { - sources = [ - "WindowTest/WindowTest.cpp", - ] + sources = [ "WindowTest/WindowTest.cpp" ] } angle_sample("gles1_hello_triangle") { - sources = [ - "gles1/HelloTriangle.cpp", - ] + sources = [ "gles1/HelloTriangle.cpp" ] } angle_sample("gles1_simple_texture_2d") { - sources = [ - "gles1/SimpleTexture2D.cpp", - ] + sources = [ "gles1/SimpleTexture2D.cpp" ] } angle_sample("gles1_simple_lighting") { - sources = [ - "gles1/SimpleLighting.cpp", - ] + sources = [ "gles1/SimpleLighting.cpp" ] } angle_sample("gles1_flat_shading") { - sources = [ - "gles1/FlatShading.cpp", - ] + sources = [ "gles1/FlatShading.cpp" ] } angle_sample("gles1_draw_texture") { - sources = [ - "gles1/DrawTexture.cpp", - ] + sources = [ "gles1/DrawTexture.cpp" ] } group("all") { diff --git a/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn b/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn index 84a12319023ee43ab6bb051d85511c87df440e02..bba76ed0a28e24c6fc8e9b8d0c1dfef74d0102ad 100644 --- a/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn +++ b/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn @@ -11,20 +11,12 @@ config("config") { } angle_shared_library("fuchsia_egl") { - sources = [ - "fuchsia_egl.c", - ] - public = [ - "fuchsia_egl.h", - ] - public_configs = [":config"] - deps = [ - ":backend", - ] + sources = [ "fuchsia_egl.c" ] + public = [ "fuchsia_egl.h" ] + public_configs = [ ":config" ] + deps = [ ":backend" ] } angle_source_set("backend") { - public = [ - "fuchsia_egl_backend.h", - ] + public = [ "fuchsia_egl_backend.h" ] } diff --git a/skia/third_party/externals/angle2/src/compiler.gni b/skia/third_party/externals/angle2/src/compiler.gni index f67f37bf0b25f50612cecee8aa9492216938c6c6..bb013389aa460d4978a41cde066839e091242eef 100644 --- a/skia/third_party/externals/angle2/src/compiler.gni +++ b/skia/third_party/externals/angle2/src/compiler.gni @@ -10,9 +10,9 @@ angle_translator_sources = [ "include/GLES2/gl2ext.h", "include/GLES2/gl2platform.h", "include/GLES3/gl3.h", - "include/GLES3/gl3platform.h", "include/GLES3/gl31.h", "include/GLES3/gl32.h", + "include/GLES3/gl3platform.h", "include/GLSLANG/ShaderLang.h", "include/GLSLANG/ShaderVars.h", "include/KHR/khrplatform.h", @@ -44,10 +44,10 @@ angle_translator_sources = [ "src/compiler/translator/FunctionLookup.h", "src/compiler/translator/HashNames.cpp", "src/compiler/translator/HashNames.h", - "src/compiler/translator/ImmutableString_autogen.cpp", "src/compiler/translator/ImmutableString.h", "src/compiler/translator/ImmutableStringBuilder.cpp", "src/compiler/translator/ImmutableStringBuilder.h", + "src/compiler/translator/ImmutableString_autogen.cpp", "src/compiler/translator/InfoSink.cpp", "src/compiler/translator/InfoSink.h", "src/compiler/translator/Initialize.cpp", @@ -55,8 +55,8 @@ angle_translator_sources = [ "src/compiler/translator/InitializeDll.cpp", "src/compiler/translator/InitializeDll.h", "src/compiler/translator/InitializeGlobals.h", - "src/compiler/translator/IntermNode.h", "src/compiler/translator/IntermNode.cpp", + "src/compiler/translator/IntermNode.h", "src/compiler/translator/IsASTDepthBelowLimit.cpp", "src/compiler/translator/IsASTDepthBelowLimit.h", "src/compiler/translator/Operator.cpp", @@ -69,8 +69,8 @@ angle_translator_sources = [ "src/compiler/translator/PoolAlloc.cpp", "src/compiler/translator/PoolAlloc.h", "src/compiler/translator/Pragma.h", - "src/compiler/translator/QualifierTypes.h", "src/compiler/translator/QualifierTypes.cpp", + "src/compiler/translator/QualifierTypes.h", "src/compiler/translator/Severity.h", "src/compiler/translator/ShaderLang.cpp", "src/compiler/translator/ShaderVars.cpp", @@ -91,8 +91,8 @@ angle_translator_sources = [ "src/compiler/translator/ValidateGlobalInitializer.h", "src/compiler/translator/ValidateLimitations.cpp", "src/compiler/translator/ValidateLimitations.h", - "src/compiler/translator/ValidateMaxParameters.h", "src/compiler/translator/ValidateMaxParameters.cpp", + "src/compiler/translator/ValidateMaxParameters.h", "src/compiler/translator/ValidateOutputs.cpp", "src/compiler/translator/ValidateOutputs.h", "src/compiler/translator/ValidateSwitch.cpp", @@ -108,8 +108,6 @@ angle_translator_sources = [ "src/compiler/translator/glslang_tab.cpp", "src/compiler/translator/glslang_tab.h", "src/compiler/translator/length_limits.h", - "src/compiler/translator/util.cpp", - "src/compiler/translator/util.h", "src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp", "src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h", "src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp", @@ -118,8 +116,8 @@ angle_translator_sources = [ "src/compiler/translator/tree_ops/ClampFragDepth.h", "src/compiler/translator/tree_ops/ClampPointSize.cpp", "src/compiler/translator/tree_ops/ClampPointSize.h", - "src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h", "src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp", + "src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h", "src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp", "src/compiler/translator/tree_ops/DeferGlobalInitializers.h", "src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp", @@ -164,10 +162,10 @@ angle_translator_sources = [ "src/compiler/translator/tree_ops/RewriteDoWhile.h", "src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp", "src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h", - "src/compiler/translator/tree_ops/RewriteStructSamplers.cpp", - "src/compiler/translator/tree_ops/RewriteStructSamplers.h", "src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp", "src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h", + "src/compiler/translator/tree_ops/RewriteStructSamplers.cpp", + "src/compiler/translator/tree_ops/RewriteStructSamplers.h", "src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp", "src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h", "src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp", @@ -202,13 +200,15 @@ angle_translator_sources = [ "src/compiler/translator/tree_util/IntermTraverse.cpp", "src/compiler/translator/tree_util/IntermTraverse.h", "src/compiler/translator/tree_util/NodeSearch.h", - "src/compiler/translator/tree_util/ReplaceVariable.cpp", - "src/compiler/translator/tree_util/ReplaceVariable.h", "src/compiler/translator/tree_util/ReplaceShadowingVariables.cpp", "src/compiler/translator/tree_util/ReplaceShadowingVariables.h", + "src/compiler/translator/tree_util/ReplaceVariable.cpp", + "src/compiler/translator/tree_util/ReplaceVariable.h", "src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp", "src/compiler/translator/tree_util/RunAtTheEndOfShader.h", "src/compiler/translator/tree_util/Visit.h", + "src/compiler/translator/util.cpp", + "src/compiler/translator/util.h", "src/third_party/compiler/ArrayBoundsClamper.cpp", "src/third_party/compiler/ArrayBoundsClamper.h", ] @@ -237,10 +237,10 @@ angle_translator_hlsl_sources = [ "src/compiler/translator/ASTMetadataHLSL.h", "src/compiler/translator/AtomicCounterFunctionHLSL.cpp", "src/compiler/translator/AtomicCounterFunctionHLSL.h", - "src/compiler/translator/blocklayoutHLSL.cpp", - "src/compiler/translator/blocklayoutHLSL.h", "src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp", "src/compiler/translator/BuiltInFunctionEmulatorHLSL.h", + "src/compiler/translator/ImageFunctionHLSL.cpp", + "src/compiler/translator/ImageFunctionHLSL.h", "src/compiler/translator/OutputHLSL.cpp", "src/compiler/translator/OutputHLSL.h", "src/compiler/translator/ResourcesHLSL.cpp", @@ -253,12 +253,12 @@ angle_translator_hlsl_sources = [ "src/compiler/translator/StructureHLSL.h", "src/compiler/translator/TextureFunctionHLSL.cpp", "src/compiler/translator/TextureFunctionHLSL.h", - "src/compiler/translator/ImageFunctionHLSL.cpp", - "src/compiler/translator/ImageFunctionHLSL.h", "src/compiler/translator/TranslatorHLSL.cpp", "src/compiler/translator/TranslatorHLSL.h", "src/compiler/translator/UtilsHLSL.cpp", "src/compiler/translator/UtilsHLSL.h", + "src/compiler/translator/blocklayoutHLSL.cpp", + "src/compiler/translator/blocklayoutHLSL.h", "src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp", "src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp", "src/compiler/translator/tree_ops/AddDefaultReturnStatements.h", diff --git a/skia/third_party/externals/angle2/src/libGLESv2.gni b/skia/third_party/externals/angle2/src/libGLESv2.gni index 11b4944bee5a568db26c3f463d638374efe4c92d..5ee345398317290fefc76077eab9cce9b4af67b8 100644 --- a/skia/third_party/externals/angle2/src/libGLESv2.gni +++ b/skia/third_party/externals/angle2/src/libGLESv2.gni @@ -174,8 +174,9 @@ libangle_sources = [ "src/libANGLE/Config.h", "src/libANGLE/Constants.h", "src/libANGLE/Context.cpp", + "src/libANGLE/Context.h", + "src/libANGLE/Context.inl.h", "src/libANGLE/Context_gl.cpp", - "src/libANGLE/Context_gles_1_0.cpp", "src/libANGLE/Context_gl_1_0_autogen.h", "src/libANGLE/Context_gl_1_1_autogen.h", "src/libANGLE/Context_gl_1_2_autogen.h", @@ -195,13 +196,12 @@ libangle_sources = [ "src/libANGLE/Context_gl_4_4_autogen.h", "src/libANGLE/Context_gl_4_5_autogen.h", "src/libANGLE/Context_gl_4_6_autogen.h", + "src/libANGLE/Context_gles_1_0.cpp", "src/libANGLE/Context_gles_1_0_autogen.h", "src/libANGLE/Context_gles_2_0_autogen.h", "src/libANGLE/Context_gles_3_0_autogen.h", "src/libANGLE/Context_gles_3_1_autogen.h", "src/libANGLE/Context_gles_ext_autogen.h", - "src/libANGLE/Context.h", - "src/libANGLE/Context.inl.h", "src/libANGLE/Debug.cpp", "src/libANGLE/Debug.h", "src/libANGLE/Device.cpp", @@ -227,12 +227,12 @@ libangle_sources = [ "src/libANGLE/GLES1State.h", "src/libANGLE/HandleAllocator.cpp", "src/libANGLE/HandleAllocator.h", - "src/libANGLE/HandleRangeAllocator.h", "src/libANGLE/HandleRangeAllocator.cpp", - "src/libANGLE/Image.h", + "src/libANGLE/HandleRangeAllocator.h", "src/libANGLE/Image.cpp", - "src/libANGLE/ImageIndex.h", + "src/libANGLE/Image.h", "src/libANGLE/ImageIndex.cpp", + "src/libANGLE/ImageIndex.h", "src/libANGLE/IndexRangeCache.cpp", "src/libANGLE/IndexRangeCache.h", "src/libANGLE/LoggingAnnotator.cpp", @@ -243,8 +243,8 @@ libangle_sources = [ "src/libANGLE/MemoryProgramCache.h", "src/libANGLE/Observer.cpp", "src/libANGLE/Observer.h", - "src/libANGLE/Path.h", "src/libANGLE/Path.cpp", + "src/libANGLE/Path.h", "src/libANGLE/Platform.cpp", "src/libANGLE/Program.cpp", "src/libANGLE/Program.h", @@ -309,13 +309,10 @@ libangle_sources = [ "src/libANGLE/queryconversions.h", "src/libANGLE/queryutils.cpp", "src/libANGLE/queryutils.h", - "src/libANGLE/trace.h", "src/libANGLE/renderer/BufferImpl.h", "src/libANGLE/renderer/CompilerImpl.h", "src/libANGLE/renderer/ContextImpl.cpp", "src/libANGLE/renderer/ContextImpl.h", - "src/libANGLE/renderer/driver_utils.cpp", - "src/libANGLE/renderer/driver_utils.h", "src/libANGLE/renderer/DeviceImpl.cpp", "src/libANGLE/renderer/DeviceImpl.h", "src/libANGLE/renderer/DisplayImpl.cpp", @@ -323,9 +320,9 @@ libangle_sources = [ "src/libANGLE/renderer/EGLImplFactory.h", "src/libANGLE/renderer/EGLSyncImpl.h", "src/libANGLE/renderer/FenceNVImpl.h", + "src/libANGLE/renderer/Format.h", "src/libANGLE/renderer/FormatID_autogen.h", "src/libANGLE/renderer/Format_table_autogen.cpp", - "src/libANGLE/renderer/Format.h", "src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h", "src/libANGLE/renderer/FramebufferImpl.h", "src/libANGLE/renderer/GLImplFactory.h", @@ -336,8 +333,8 @@ libangle_sources = [ "src/libANGLE/renderer/ProgramPipelineImpl.h", "src/libANGLE/renderer/QueryImpl.cpp", "src/libANGLE/renderer/QueryImpl.h", - "src/libANGLE/renderer/RenderbufferImpl.h", "src/libANGLE/renderer/RenderTargetCache.h", + "src/libANGLE/renderer/RenderbufferImpl.h", "src/libANGLE/renderer/SamplerImpl.h", "src/libANGLE/renderer/SemaphoreImpl.h", "src/libANGLE/renderer/ShaderImpl.cpp", @@ -352,36 +349,32 @@ libangle_sources = [ "src/libANGLE/renderer/VertexArrayImpl.h", "src/libANGLE/renderer/copyvertex.h", "src/libANGLE/renderer/copyvertex.inc.h", + "src/libANGLE/renderer/driver_utils.cpp", + "src/libANGLE/renderer/driver_utils.h", "src/libANGLE/renderer/load_functions_table.h", "src/libANGLE/renderer/load_functions_table_autogen.cpp", "src/libANGLE/renderer/renderer_utils.cpp", "src/libANGLE/renderer/renderer_utils.h", + "src/libANGLE/trace.h", "src/libANGLE/validationEGL.cpp", "src/libANGLE/validationEGL.h", "src/libANGLE/validationES.cpp", "src/libANGLE/validationES.h", "src/libANGLE/validationES1.cpp", - "src/libANGLE/validationES1_autogen.h", "src/libANGLE/validationES1.h", + "src/libANGLE/validationES1_autogen.h", "src/libANGLE/validationES2.cpp", - "src/libANGLE/validationES2_autogen.h", "src/libANGLE/validationES2.h", + "src/libANGLE/validationES2_autogen.h", "src/libANGLE/validationES3.cpp", + "src/libANGLE/validationES3.h", "src/libANGLE/validationES31.cpp", - "src/libANGLE/validationES31_autogen.h", "src/libANGLE/validationES31.h", + "src/libANGLE/validationES31_autogen.h", "src/libANGLE/validationES3_autogen.h", - "src/libANGLE/validationES3.h", - "src/libANGLE/validationESEXT_autogen.h", "src/libANGLE/validationESEXT.h", + "src/libANGLE/validationESEXT_autogen.h", "src/libANGLE/validationGL1.cpp", - "src/libANGLE/validationGL1_autogen.h", - "src/libANGLE/validationGL2.cpp", - "src/libANGLE/validationGL2_autogen.h", - "src/libANGLE/validationGL3.cpp", - "src/libANGLE/validationGL3_autogen.h", - "src/libANGLE/validationGL4.cpp", - "src/libANGLE/validationGL4_autogen.h", "src/libANGLE/validationGL11.cpp", "src/libANGLE/validationGL11_autogen.h", "src/libANGLE/validationGL12.cpp", @@ -392,14 +385,20 @@ libangle_sources = [ "src/libANGLE/validationGL14_autogen.h", "src/libANGLE/validationGL15.cpp", "src/libANGLE/validationGL15_autogen.h", + "src/libANGLE/validationGL1_autogen.h", + "src/libANGLE/validationGL2.cpp", "src/libANGLE/validationGL21.cpp", "src/libANGLE/validationGL21_autogen.h", + "src/libANGLE/validationGL2_autogen.h", + "src/libANGLE/validationGL3.cpp", "src/libANGLE/validationGL31.cpp", "src/libANGLE/validationGL31_autogen.h", "src/libANGLE/validationGL32.cpp", "src/libANGLE/validationGL32_autogen.h", "src/libANGLE/validationGL33.cpp", "src/libANGLE/validationGL33_autogen.h", + "src/libANGLE/validationGL3_autogen.h", + "src/libANGLE/validationGL4.cpp", "src/libANGLE/validationGL41.cpp", "src/libANGLE/validationGL41_autogen.h", "src/libANGLE/validationGL42.cpp", @@ -412,6 +411,7 @@ libangle_sources = [ "src/libANGLE/validationGL45_autogen.h", "src/libANGLE/validationGL46.cpp", "src/libANGLE/validationGL46_autogen.h", + "src/libANGLE/validationGL4_autogen.h", "src/third_party/trace_event/trace_event.h", ] @@ -431,7 +431,6 @@ libangle_d3d_shared_sources = [ "src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h", "src/libANGLE/renderer/d3d/EGLImageD3D.cpp", "src/libANGLE/renderer/d3d/EGLImageD3D.h", - "src/libANGLE/renderer/d3d/formatutilsD3D.h", "src/libANGLE/renderer/d3d/FramebufferD3D.cpp", "src/libANGLE/renderer/d3d/FramebufferD3D.h", "src/libANGLE/renderer/d3d/HLSLCompiler.cpp", @@ -446,12 +445,12 @@ libangle_d3d_shared_sources = [ "src/libANGLE/renderer/d3d/NativeWindowD3D.h", "src/libANGLE/renderer/d3d/ProgramD3D.cpp", "src/libANGLE/renderer/d3d/ProgramD3D.h", + "src/libANGLE/renderer/d3d/RenderTargetD3D.cpp", + "src/libANGLE/renderer/d3d/RenderTargetD3D.h", "src/libANGLE/renderer/d3d/RenderbufferD3D.cpp", "src/libANGLE/renderer/d3d/RenderbufferD3D.h", "src/libANGLE/renderer/d3d/RendererD3D.cpp", "src/libANGLE/renderer/d3d/RendererD3D.h", - "src/libANGLE/renderer/d3d/RenderTargetD3D.h", - "src/libANGLE/renderer/d3d/RenderTargetD3D.cpp", "src/libANGLE/renderer/d3d/SamplerD3D.h", "src/libANGLE/renderer/d3d/ShaderD3D.cpp", "src/libANGLE/renderer/d3d/ShaderD3D.h", @@ -468,6 +467,7 @@ libangle_d3d_shared_sources = [ "src/libANGLE/renderer/d3d/VertexBuffer.h", "src/libANGLE/renderer/d3d/VertexDataManager.cpp", "src/libANGLE/renderer/d3d/VertexDataManager.h", + "src/libANGLE/renderer/d3d/formatutilsD3D.h", ] libangle_d3d9_sources = [ @@ -481,8 +481,6 @@ libangle_d3d9_sources = [ "src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h", "src/libANGLE/renderer/d3d/d3d9/Fence9.cpp", "src/libANGLE/renderer/d3d/d3d9/Fence9.h", - "src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp", - "src/libANGLE/renderer/d3d/d3d9/formatutils9.h", "src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp", "src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h", "src/libANGLE/renderer/d3d/d3d9/Image9.cpp", @@ -493,23 +491,13 @@ libangle_d3d9_sources = [ "src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h", "src/libANGLE/renderer/d3d/d3d9/Query9.cpp", "src/libANGLE/renderer/d3d/d3d9/Query9.h", - "src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp", - "src/libANGLE/renderer/d3d/d3d9/Renderer9.h", - "src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp", - "src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h", "src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp", "src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h", + "src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp", + "src/libANGLE/renderer/d3d/d3d9/Renderer9.h", "src/libANGLE/renderer/d3d/d3d9/ShaderCache.h", "src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp", "src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h", - "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h", "src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp", "src/libANGLE/renderer/d3d/d3d9/StateManager9.h", "src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp", @@ -519,9 +507,21 @@ libangle_d3d9_sources = [ "src/libANGLE/renderer/d3d/d3d9/VertexArray9.h", "src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp", "src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h", - "src/libANGLE/renderer/d3d/d3d9/vertexconversion.h", "src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp", "src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h", + "src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp", + "src/libANGLE/renderer/d3d/d3d9/formatutils9.h", + "src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp", + "src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h", + "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h", + "src/libANGLE/renderer/d3d/d3d9/vertexconversion.h", ] libangle_d3d11_sources = [ @@ -536,15 +536,10 @@ libangle_d3d11_sources = [ "src/libANGLE/renderer/d3d/d3d11/Context11.h", "src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp", "src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h", - "src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp", - "src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp", - "src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h", "src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.cpp", "src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.h", "src/libANGLE/renderer/d3d/d3d11/Fence11.cpp", "src/libANGLE/renderer/d3d/d3d11/Fence11.h", - "src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp", - "src/libANGLE/renderer/d3d/d3d11/formatutils11.h", "src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp", "src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h", "src/libANGLE/renderer/d3d/d3d11/Image11.cpp", @@ -553,9 +548,9 @@ libangle_d3d11_sources = [ "src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h", "src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp", "src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h", - "src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h", "src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.cpp", "src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.h", + "src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h", "src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp", "src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h", "src/libANGLE/renderer/d3d/d3d11/Program11.cpp", @@ -564,18 +559,39 @@ libangle_d3d11_sources = [ "src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h", "src/libANGLE/renderer/d3d/d3d11/Query11.cpp", "src/libANGLE/renderer/d3d/d3d11/Query11.h", - "src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp", - "src/libANGLE/renderer/d3d/d3d11/Renderer11.h", - "src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp", - "src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h", "src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp", "src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h", "src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp", "src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h", + "src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp", + "src/libANGLE/renderer/d3d/d3d11/Renderer11.h", "src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp", "src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h", "src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp", "src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h", + "src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp", + "src/libANGLE/renderer/d3d/d3d11/StateManager11.h", + "src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp", + "src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h", + "src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp", + "src/libANGLE/renderer/d3d/d3d11/SwapChain11.h", + "src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp", + "src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h", + "src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp", + "src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h", + "src/libANGLE/renderer/d3d/d3d11/Trim11.cpp", + "src/libANGLE/renderer/d3d/d3d11/Trim11.h", + "src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp", + "src/libANGLE/renderer/d3d/d3d11/VertexArray11.h", + "src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp", + "src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h", + "src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp", + "src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h", + "src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp", + "src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp", + "src/libANGLE/renderer/d3d/d3d11/formatutils11.h", + "src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp", + "src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h", "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h", "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h", "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h", @@ -630,33 +646,17 @@ libangle_d3d11_sources = [ "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h", "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h", "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h", - "src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp", - "src/libANGLE/renderer/d3d/d3d11/StateManager11.h", - "src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp", - "src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h", - "src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp", - "src/libANGLE/renderer/d3d/d3d11/SwapChain11.h", "src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp", "src/libANGLE/renderer/d3d/d3d11/texture_format_table.h", "src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp", "src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h", - "src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp", - "src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h", - "src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp", - "src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h", - "src/libANGLE/renderer/d3d/d3d11/Trim11.cpp", - "src/libANGLE/renderer/d3d/d3d11/Trim11.h", - "src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp", - "src/libANGLE/renderer/d3d/d3d11/VertexArray11.h", - "src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp", - "src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h", ] libangle_d3d11_win32_sources = [ - "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp", - "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h", "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp", "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h", + "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp", + "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h", "src/third_party/systeminfo/SystemInfo.cpp", "src/third_party/systeminfo/SystemInfo.h", ] @@ -697,8 +697,8 @@ libangle_gl_sources = [ "src/libANGLE/renderer/gl/ImageGL.h", "src/libANGLE/renderer/gl/MemoryObjectGL.cpp", "src/libANGLE/renderer/gl/MemoryObjectGL.h", - "src/libANGLE/renderer/gl/PathGL.h", "src/libANGLE/renderer/gl/PathGL.cpp", + "src/libANGLE/renderer/gl/PathGL.h", "src/libANGLE/renderer/gl/ProgramGL.cpp", "src/libANGLE/renderer/gl/ProgramGL.h", "src/libANGLE/renderer/gl/ProgramPipelineGL.cpp", @@ -745,10 +745,10 @@ libangle_gl_wgl_sources = [ "src/libANGLE/renderer/gl/wgl/ContextWGL.h", "src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp", "src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h", - "src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp", - "src/libANGLE/renderer/gl/wgl/DisplayWGL.h", "src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp", "src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h", + "src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp", + "src/libANGLE/renderer/gl/wgl/DisplayWGL.h", "src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp", "src/libANGLE/renderer/gl/wgl/FunctionsWGL.h", "src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp", @@ -769,10 +769,10 @@ libangle_gl_glx_sources = [ "src/libANGLE/renderer/gl/glx/DisplayGLX.h", "src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp", "src/libANGLE/renderer/gl/glx/FunctionsGLX.h", - "src/libANGLE/renderer/gl/glx/RendererGLX.h", - "src/libANGLE/renderer/gl/glx/RendererGLX.cpp", "src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp", "src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h", + "src/libANGLE/renderer/gl/glx/RendererGLX.cpp", + "src/libANGLE/renderer/gl/glx/RendererGLX.h", "src/libANGLE/renderer/gl/glx/SurfaceGLX.h", "src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp", "src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h", @@ -786,13 +786,10 @@ libangle_gl_egl_sources = [ "src/libANGLE/renderer/gl/egl/DisplayEGL.cpp", "src/libANGLE/renderer/gl/egl/DisplayEGL.h", "src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h", - "src/libANGLE/renderer/gl/egl/egl_utils.cpp", - "src/libANGLE/renderer/gl/egl/egl_utils.h", "src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp", "src/libANGLE/renderer/gl/egl/FunctionsEGL.h", "src/libANGLE/renderer/gl/egl/ImageEGL.cpp", "src/libANGLE/renderer/gl/egl/ImageEGL.h", - "src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h", "src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp", "src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h", "src/libANGLE/renderer/gl/egl/RendererEGL.cpp", @@ -803,6 +800,9 @@ libangle_gl_egl_sources = [ "src/libANGLE/renderer/gl/egl/SyncEGL.h", "src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp", "src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h", + "src/libANGLE/renderer/gl/egl/egl_utils.cpp", + "src/libANGLE/renderer/gl/egl/egl_utils.h", + "src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h", ] libangle_gl_egl_dl_sources = [ "src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp", @@ -826,16 +826,16 @@ libangle_gl_egl_android_sources = [ libangle_gl_cgl_sources = [ "src/libANGLE/renderer/gl/cgl/ContextCGL.cpp", "src/libANGLE/renderer/gl/cgl/ContextCGL.h", - "src/libANGLE/renderer/gl/cgl/DisplayCGL.mm", "src/libANGLE/renderer/gl/cgl/DisplayCGL.h", - "src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm", + "src/libANGLE/renderer/gl/cgl/DisplayCGL.mm", "src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h", - "src/libANGLE/renderer/gl/cgl/RendererCGL.mm", - "src/libANGLE/renderer/gl/cgl/RendererCGL.h", - "src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm", + "src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm", "src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h", - "src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm", + "src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm", + "src/libANGLE/renderer/gl/cgl/RendererCGL.h", + "src/libANGLE/renderer/gl/cgl/RendererCGL.mm", "src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h", + "src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm", ] libangle_mac_sources = [ "src/libANGLE/renderer/driver_utils_mac.mm" ] @@ -865,18 +865,18 @@ libangle_vulkan_sources = [ "src/libANGLE/renderer/vulkan/MemoryObjectVk.h", "src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp", "src/libANGLE/renderer/vulkan/PersistentCommandPool.h", - "src/libANGLE/renderer/vulkan/ProgramVk.cpp", - "src/libANGLE/renderer/vulkan/ProgramVk.h", "src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp", "src/libANGLE/renderer/vulkan/ProgramPipelineVk.h", + "src/libANGLE/renderer/vulkan/ProgramVk.cpp", + "src/libANGLE/renderer/vulkan/ProgramVk.h", "src/libANGLE/renderer/vulkan/QueryVk.cpp", "src/libANGLE/renderer/vulkan/QueryVk.h", + "src/libANGLE/renderer/vulkan/RenderTargetVk.cpp", + "src/libANGLE/renderer/vulkan/RenderTargetVk.h", "src/libANGLE/renderer/vulkan/RenderbufferVk.cpp", "src/libANGLE/renderer/vulkan/RenderbufferVk.h", "src/libANGLE/renderer/vulkan/RendererVk.cpp", "src/libANGLE/renderer/vulkan/RendererVk.h", - "src/libANGLE/renderer/vulkan/RenderTargetVk.cpp", - "src/libANGLE/renderer/vulkan/RenderTargetVk.h", "src/libANGLE/renderer/vulkan/SamplerVk.cpp", "src/libANGLE/renderer/vulkan/SamplerVk.h", "src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp", @@ -902,12 +902,12 @@ libangle_vulkan_sources = [ "src/libANGLE/renderer/vulkan/vk_caps_utils.cpp", "src/libANGLE/renderer/vulkan/vk_caps_utils.h", "src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp", - "src/libANGLE/renderer/vulkan/vk_format_utils.h", "src/libANGLE/renderer/vulkan/vk_format_utils.cpp", + "src/libANGLE/renderer/vulkan/vk_format_utils.h", "src/libANGLE/renderer/vulkan/vk_helpers.cpp", "src/libANGLE/renderer/vulkan/vk_helpers.h", - "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h", "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp", + "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h", "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp", "src/libANGLE/renderer/vulkan/vk_utils.cpp", "src/libANGLE/renderer/vulkan/vk_utils.h", @@ -1018,8 +1018,6 @@ libangle_null_sources = [ libgl_sources = [ "src/common/angleutils.h", "src/common/debug.h", - "src/libGLESv2/global_state.cpp", - "src/libGLESv2/global_state.h", "src/libGL/entry_points_gl_1_0_autogen.cpp", "src/libGL/entry_points_gl_1_0_autogen.h", "src/libGL/entry_points_gl_1_1_autogen.cpp", @@ -1053,19 +1051,21 @@ libgl_sources = [ "src/libGL/entry_points_gl_4_3_autogen.cpp", "src/libGL/entry_points_gl_4_3_autogen.h", "src/libGL/entry_points_gl_4_4_autogen.cpp", - "src/libGL/entry_points_gl_4_6_autogen.cpp", "src/libGL/entry_points_gl_4_4_autogen.h", "src/libGL/entry_points_gl_4_5_autogen.cpp", "src/libGL/entry_points_gl_4_5_autogen.h", + "src/libGL/entry_points_gl_4_6_autogen.cpp", "src/libGL/entry_points_gl_4_6_autogen.h", "src/libGL/entry_points_wgl.cpp", "src/libGL/entry_points_wgl.h", + "src/libGL/libGL.rc", "src/libGL/libGL_autogen.cpp", "src/libGL/libGL_autogen.def", - "src/libGL/libGL.rc", "src/libGL/proc_table_wgl.h", "src/libGL/proc_table_wgl_autogen.cpp", "src/libGL/resource.h", + "src/libGLESv2/global_state.cpp", + "src/libGLESv2/global_state.h", ] libglesv2_sources = [ @@ -1089,8 +1089,8 @@ libglesv2_sources = [ "src/libGLESv2/entry_points_gles_ext_autogen.h", "src/libGLESv2/global_state.cpp", "src/libGLESv2/global_state.h", - "src/libGLESv2/libGLESv2_autogen.cpp", "src/libGLESv2/libGLESv2.rc", + "src/libGLESv2/libGLESv2_autogen.cpp", "src/libGLESv2/proc_table_egl.h", "src/libGLESv2/proc_table_egl_autogen.cpp", "src/libGLESv2/resource.h", @@ -1104,10 +1104,10 @@ libglesv1_cm_sources = [ ] libegl_sources = [ + "src/libEGL/egl_loader_autogen.h", "src/libEGL/libEGL.cpp", "src/libEGL/libEGL.rc", "src/libEGL/resource.h", "src/libGLESv2/entry_points_egl.h", "src/libGLESv2/entry_points_egl_ext.h", - "src/libEGL/egl_loader_autogen.h", ] diff --git a/skia/third_party/externals/angle2/src/tests/BUILD.gn b/skia/third_party/externals/angle2/src/tests/BUILD.gn index 7609039835d4191c84b3e87fd1af8f9b36e51864..3e96129d9ffa53b6f23a8d9bdd51aab5348e1807 100644 --- a/skia/third_party/externals/angle2/src/tests/BUILD.gn +++ b/skia/third_party/externals/angle2/src/tests/BUILD.gn @@ -59,20 +59,14 @@ template("angle_tests_main") { source_set(target_name) { testonly = true public_deps = googletest_deps - deps = [ - "${angle_root}:includes", - ] + deps = [ "${angle_root}:includes" ] main = invoker.main if (build_with_chromium) { - sources = [ - "//gpu/$main.cc", - ] + sources = [ "//gpu/$main.cc" ] } else { - sources = [ - "$main.cpp", - ] + sources = [ "$main.cpp" ] } } } @@ -93,9 +87,7 @@ angle_tests_main("angle_perftests_main") { angle_test("angle_unittests_helper") { sources = angle_unittests_helper_sources - deps = [ - "${angle_root}:angle_common", - ] + deps = [ "${angle_root}:angle_common" ] } test_expectations_sources = [ @@ -148,9 +140,7 @@ angle_test("angle_unittests") { if (!is_android && !is_fuchsia) { # SystemUtils.RunApp, the only unittest using a helper binary, is not supported on these # platforms yet. - data_deps = [ - ":angle_unittests_helper", - ] + data_deps = [ ":angle_unittests_helper" ] } } @@ -612,9 +602,11 @@ if (build_angle_deqp_tests && !is_fuchsia) { # TODO(jmadill): Remove this once we fix dEQP. cflags_c = [ "-Wno-unused-local-typedef" ] cflags_cc = [ - "-Wno-string-conversion", # implicit conversion turns string literal into bool + "-Wno-string-conversion", # implicit conversion turns string literal + # into bool "-Wno-unused-local-typedef", - "-Wno-unused-result", # ignoring return value of function declared with 'nodiscard' attribute + "-Wno-unused-result", # ignoring return value of function declared with + # 'nodiscard' attribute ] } @@ -734,9 +726,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ":angle_deqp_support", ] - public_deps = [ - ":angle_deqp_framework_debase", - ] + public_deps = [ ":angle_deqp_framework_debase" ] } config("angle_deqp_framework_common_config") { @@ -767,9 +757,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { angle_deqp_source_set("angle_deqp_framework_opengl") { sources = deqp_framework_opengl_sources public_configs = [ ":angle_deqp_framework_opengl_config" ] - public_deps = [ - ":angle_deqp_framework_common", - ] + public_deps = [ ":angle_deqp_framework_common" ] } config("angle_deqp_framework_egl_config") { @@ -782,9 +770,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { angle_deqp_source_set("angle_deqp_framework_egl") { sources = deqp_framework_egl_sources public_configs = [ ":angle_deqp_framework_egl_config" ] - public_deps = [ - ":angle_deqp_framework_opengl", - ] + public_deps = [ ":angle_deqp_framework_opengl" ] } config("angle_deqp_framework_qphelper_config") { @@ -806,9 +792,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { angle_deqp_source_set("angle_deqp_glshared") { sources = deqp_glshared_sources - public_deps = [ - ":angle_deqp_framework_opengl", - ] + public_deps = [ ":angle_deqp_framework_opengl" ] public_configs = [ ":angle_deqp_glshared_config" ] } @@ -886,12 +870,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { if (!build_with_chromium) { angle_executable("angle_deqp_${_api}_no_gtest") { - sources = [ - "deqp_support/angle_deqp_tests_main.cpp", - ] - deps = [ - ":$shared_library_name", - ] + sources = [ "deqp_support/angle_deqp_tests_main.cpp" ] + deps = [ ":$shared_library_name" ] } } @@ -902,9 +882,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ] # Must be included outside of the source set for the define - sources = [ - "deqp_support/angle_deqp_gtest.cpp", - ] + sources = [ "deqp_support/angle_deqp_gtest.cpp" ] data = [ "deqp_support/deqp_${_api}_test_expectations.txt", @@ -931,9 +909,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { defines += [ "ANGLE_DEQP_DATA_DIR=\"data\"" ] mustpass_name = "${_api}-master.txt" - data = [ - "$deqp_path/data/", - ] + data = [ "$deqp_path/data/" ] } } @@ -974,7 +950,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { "$deqp_path/external/openglcts/modules/glesext", ] if (is_clang) { - cflags = [ "-Wno-header-hygiene" ] # using namespace directive in global context in header + cflags = [ "-Wno-header-hygiene" ] # using namespace directive in global + # context in header } } @@ -1023,9 +1000,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { mustpass_dir = _khronos_mustpass - data = [ - "$root_out_dir/$angle_data_dir/gl_cts/", - ] + data = [ "$root_out_dir/$angle_data_dir/gl_cts/" ] } } diff --git a/skia/third_party/externals/angle2/src/tests/angle_end2end_tests.gni b/skia/third_party/externals/angle2/src/tests/angle_end2end_tests.gni index f438f72c098996fe26f43177670931400e2c69a8..0dc9989a5cc033faea6f87ceaf55f66590042371 100644 --- a/skia/third_party/externals/angle2/src/tests/angle_end2end_tests.gni +++ b/skia/third_party/externals/angle2/src/tests/angle_end2end_tests.gni @@ -3,14 +3,28 @@ # found in the LICENSE file. angle_end2end_tests_sources = [ + "egl_tests/EGLBackwardsCompatibleContextTest.cpp", + "egl_tests/EGLBlobCacheTest.cpp", + "egl_tests/EGLChooseConfigTest.cpp", + "egl_tests/EGLContextCompatibilityTest.cpp", + "egl_tests/EGLContextSharingTest.cpp", + "egl_tests/EGLDebugTest.cpp", + "egl_tests/EGLProgramCacheControlTest.cpp", + "egl_tests/EGLQueryContextTest.cpp", + "egl_tests/EGLRecordableTest.cpp", + "egl_tests/EGLRobustnessTest.cpp", + "egl_tests/EGLSanityCheckTest.cpp", + "egl_tests/EGLSurfaceTest.cpp", + "egl_tests/EGLSurfacelessContextTest.cpp", + "egl_tests/EGLSyncTest.cpp", "gl_tests/AtomicCounterBufferTest.cpp", "gl_tests/AttributeLayoutTest.cpp", + "gl_tests/BPTCCompressedTextureTest.cpp", "gl_tests/BindGeneratesResourceTest.cpp", "gl_tests/BindUniformLocationTest.cpp", "gl_tests/BlendFuncExtendedTest.cpp", "gl_tests/BlendMinMaxTest.cpp", "gl_tests/BlitFramebufferANGLETest.cpp", - "gl_tests/BPTCCompressedTextureTest.cpp", "gl_tests/BufferDataTest.cpp", "gl_tests/BuiltinVariableTest.cpp", "gl_tests/ClearTest.cpp", @@ -20,9 +34,11 @@ angle_end2end_tests_sources = [ "gl_tests/ContextLostTest.cpp", "gl_tests/CopyCompressedTextureTest.cpp", "gl_tests/CopyTexImageTest.cpp", - "gl_tests/CopyTextureTest.cpp", "gl_tests/CopyTexture3DTest.cpp", + "gl_tests/CopyTextureTest.cpp", "gl_tests/CubeMapTextureTest.cpp", + "gl_tests/DXT1CompressedTextureTest.cpp", + "gl_tests/DXTSRGBCompressedTextureTest.cpp", "gl_tests/DebugMarkerTest.cpp", "gl_tests/DebugTest.cpp", "gl_tests/DepthStencilFormatsTest.cpp", @@ -31,8 +47,6 @@ angle_end2end_tests_sources = [ "gl_tests/DiscardFramebufferEXTTest.cpp", "gl_tests/DrawBuffersTest.cpp", "gl_tests/DrawElementsTest.cpp", - "gl_tests/DXT1CompressedTextureTest.cpp", - "gl_tests/DXTSRGBCompressedTextureTest.cpp", "gl_tests/ETCTextureTest.cpp", "gl_tests/ExplicitContextTest.cpp", "gl_tests/FenceSyncTests.cpp", @@ -41,32 +55,8 @@ angle_end2end_tests_sources = [ "gl_tests/FramebufferMultiviewTest.cpp", "gl_tests/FramebufferRenderMipmapTest.cpp", "gl_tests/FramebufferTest.cpp", - "gl_tests/GeometryShaderTest.cpp", - "gl_tests/gles1/AlphaFuncTest.cpp", - "gl_tests/gles1/BasicDrawTest.cpp", - "gl_tests/gles1/ClientActiveTextureTest.cpp", - "gl_tests/gles1/ClientStateEnable.cpp", - "gl_tests/gles1/ClipPlaneTest.cpp", - "gl_tests/gles1/CurrentColorTest.cpp", - "gl_tests/gles1/CurrentNormalTest.cpp", - "gl_tests/gles1/CurrentTextureCoordsTest.cpp", - "gl_tests/gles1/DrawTextureTest.cpp", - "gl_tests/gles1/FogTest.cpp", - "gl_tests/gles1/MaterialsTest.cpp", - "gl_tests/gles1/MatrixBuiltinsTest.cpp", - "gl_tests/gles1/MatrixLoadTest.cpp", - "gl_tests/gles1/MatrixModeTest.cpp", - "gl_tests/gles1/MatrixMultTest.cpp", - "gl_tests/gles1/MatrixStackTest.cpp", - "gl_tests/gles1/LightsTest.cpp", - "gl_tests/gles1/PointParameterTest.cpp", - "gl_tests/gles1/PointSpriteTest.cpp", - "gl_tests/gles1/ShadeModelTest.cpp", - "gl_tests/gles1/TextureEnvTest.cpp", - "gl_tests/gles1/TextureParameterTest.cpp", - "gl_tests/gles1/TextureTargetEnableTest.cpp", - "gl_tests/gles1/VertexPointerTest.cpp", "gl_tests/GLSLTest.cpp", + "gl_tests/GeometryShaderTest.cpp", "gl_tests/ImageTest.cpp", "gl_tests/IncompleteTextureTest.cpp", "gl_tests/IndexBufferOffsetTest.cpp", @@ -75,28 +65,27 @@ angle_end2end_tests_sources = [ "gl_tests/LineLoopTest.cpp", "gl_tests/LinkAndRelinkTest.cpp", "gl_tests/MaxTextureSizeTest.cpp", - "gl_tests/MemorySizeTest.cpp", "gl_tests/MemoryObjectTest.cpp", + "gl_tests/MemorySizeTest.cpp", "gl_tests/MipmapTest.cpp", "gl_tests/MultiDrawTest.cpp", "gl_tests/MultisampleCompatibilityTest.cpp", "gl_tests/MultisampleTest.cpp", "gl_tests/MultithreadingTest.cpp", "gl_tests/MultiviewDrawTest.cpp", - "gl_tests/media/pixel.inc", + "gl_tests/ObjectAllocationTest.cpp", + "gl_tests/OcclusionQueriesTest.cpp", + "gl_tests/PBOExtensionTest.cpp", "gl_tests/PackUnpackTest.cpp", + "gl_tests/ParallelShaderCompileTest.cpp", "gl_tests/PathRenderingTest.cpp", "gl_tests/PbufferTest.cpp", - "gl_tests/PBOExtensionTest.cpp", "gl_tests/PointSpritesTest.cpp", - "gl_tests/ProvokingVertexTest.cpp", - "gl_tests/ObjectAllocationTest.cpp", - "gl_tests/OcclusionQueriesTest.cpp", - "gl_tests/ParallelShaderCompileTest.cpp", "gl_tests/ProgramBinaryTest.cpp", "gl_tests/ProgramInterfaceTest.cpp", "gl_tests/ProgramParameterTest.cpp", "gl_tests/ProgramPipelineTest.cpp", + "gl_tests/ProvokingVertexTest.cpp", "gl_tests/ReadPixelsTest.cpp", "gl_tests/RenderbufferMultisampleTest.cpp", "gl_tests/RendererTest.cpp", @@ -104,13 +93,13 @@ angle_end2end_tests_sources = [ "gl_tests/RobustBufferAccessBehaviorTest.cpp", "gl_tests/RobustClientMemoryTest.cpp", "gl_tests/RobustResourceInitTest.cpp", + "gl_tests/SRGBFramebufferTest.cpp", + "gl_tests/SRGBTextureTest.cpp", "gl_tests/SamplersTest.cpp", "gl_tests/SemaphoreTest.cpp", "gl_tests/ShaderStorageBufferTest.cpp", "gl_tests/SimpleOperationTest.cpp", "gl_tests/SixteenBppTextureTest.cpp", - "gl_tests/SRGBFramebufferTest.cpp", - "gl_tests/SRGBTextureTest.cpp", "gl_tests/StateChangeTest.cpp", "gl_tests/SwizzleTest.cpp", "gl_tests/SyncQueriesTest.cpp", @@ -130,20 +119,31 @@ angle_end2end_tests_sources = [ "gl_tests/WebGLCompatibilityTest.cpp", "gl_tests/WebGLFramebufferTest.cpp", "gl_tests/WebGLReadOutsideFramebufferTest.cpp", - "egl_tests/EGLBackwardsCompatibleContextTest.cpp", - "egl_tests/EGLBlobCacheTest.cpp", - "egl_tests/EGLChooseConfigTest.cpp", - "egl_tests/EGLContextCompatibilityTest.cpp", - "egl_tests/EGLContextSharingTest.cpp", - "egl_tests/EGLDebugTest.cpp", - "egl_tests/EGLProgramCacheControlTest.cpp", - "egl_tests/EGLQueryContextTest.cpp", - "egl_tests/EGLRecordableTest.cpp", - "egl_tests/EGLRobustnessTest.cpp", - "egl_tests/EGLSanityCheckTest.cpp", - "egl_tests/EGLSurfacelessContextTest.cpp", - "egl_tests/EGLSurfaceTest.cpp", - "egl_tests/EGLSyncTest.cpp", + "gl_tests/gles1/AlphaFuncTest.cpp", + "gl_tests/gles1/BasicDrawTest.cpp", + "gl_tests/gles1/ClientActiveTextureTest.cpp", + "gl_tests/gles1/ClientStateEnable.cpp", + "gl_tests/gles1/ClipPlaneTest.cpp", + "gl_tests/gles1/CurrentColorTest.cpp", + "gl_tests/gles1/CurrentNormalTest.cpp", + "gl_tests/gles1/CurrentTextureCoordsTest.cpp", + "gl_tests/gles1/DrawTextureTest.cpp", + "gl_tests/gles1/FogTest.cpp", + "gl_tests/gles1/LightsTest.cpp", + "gl_tests/gles1/MaterialsTest.cpp", + "gl_tests/gles1/MatrixBuiltinsTest.cpp", + "gl_tests/gles1/MatrixLoadTest.cpp", + "gl_tests/gles1/MatrixModeTest.cpp", + "gl_tests/gles1/MatrixMultTest.cpp", + "gl_tests/gles1/MatrixStackTest.cpp", + "gl_tests/gles1/PointParameterTest.cpp", + "gl_tests/gles1/PointSpriteTest.cpp", + "gl_tests/gles1/ShadeModelTest.cpp", + "gl_tests/gles1/TextureEnvTest.cpp", + "gl_tests/gles1/TextureParameterTest.cpp", + "gl_tests/gles1/TextureTargetEnableTest.cpp", + "gl_tests/gles1/VertexPointerTest.cpp", + "gl_tests/media/pixel.inc", "test_expectations/GPUTestExpectationsTest.cpp", "test_utils/ANGLETest.cpp", "test_utils/ANGLETest.h", @@ -158,12 +158,12 @@ angle_end2end_tests_sources = [ angle_end2end_tests_mac_sources = [ "egl_tests/EGLIOSurfaceClientBufferTest.cpp" ] angle_end2end_tests_win_sources = [ - "gl_tests/D3DImageFormatConversionTest.cpp", "egl_tests/EGLDeviceTest.cpp", "egl_tests/EGLPresentPathD3D11Test.cpp", "egl_tests/EGLStreamTest.cpp", "egl_tests/EGLSyncControlTest.cpp", "egl_tests/media/yuvtest.inl", + "gl_tests/D3DImageFormatConversionTest.cpp", ] angle_end2end_tests_x11_sources = [ "egl_tests/EGLX11VisualTest.cpp" ] angle_end2end_tests_vulkan_sources = [ diff --git a/skia/third_party/externals/angle2/src/tests/angle_perftests.gni b/skia/third_party/externals/angle2/src/tests/angle_perftests.gni index 691913cbdc7204b81adb7afce6342d6faa523859..8b1b97bfbe27652642b717b33ec4269ff9e27249 100644 --- a/skia/third_party/externals/angle2/src/tests/angle_perftests.gni +++ b/skia/third_party/externals/angle2/src/tests/angle_perftests.gni @@ -49,13 +49,15 @@ angle_perf_tests_sources = _angle_perf_test_common_sources + [ "test_utils/draw_call_perf_utils.h", ] -angle_white_box_perf_tests_sources = _angle_perf_test_common_sources + [ - "angle_unittests_utils.h", - "perf_tests/BitSetIteratorPerf.cpp", - "perf_tests/CompilerPerf.cpp", - "perf_tests/EGLInitializePerf.cpp", # Uses ANGLEGetDisplayPlatform, a non-standard EP. - "perf_tests/ResultPerf.cpp", - ] +angle_white_box_perf_tests_sources = + _angle_perf_test_common_sources + [ + "angle_unittests_utils.h", + "perf_tests/BitSetIteratorPerf.cpp", + "perf_tests/CompilerPerf.cpp", + "perf_tests/EGLInitializePerf.cpp", # Uses ANGLEGetDisplayPlatform, a + # non-standard EP. + "perf_tests/ResultPerf.cpp", + ] angle_white_box_perf_tests_win_sources = [ "perf_tests/IndexDataManagerTest.cpp" ] diff --git a/skia/third_party/externals/angle2/src/tests/angle_unittests.gni b/skia/third_party/externals/angle2/src/tests/angle_unittests.gni index 8cdf65d74332a3ac3e33613c2f44c448fa755db2..7d1140b226293a4d29ef4eb9bcc9a2361dd2fa69 100644 --- a/skia/third_party/externals/angle2/src/tests/angle_unittests.gni +++ b/skia/third_party/externals/angle2/src/tests/angle_unittests.gni @@ -5,8 +5,8 @@ angle_unittests_sources = [ "../common/FastVector_unittest.cpp", "../common/FixedVector_unittest.cpp", - "../common/PoolAlloc_unittest.cpp", "../common/Optional_unittest.cpp", + "../common/PoolAlloc_unittest.cpp", "../common/aligned_memory_unittest.cpp", "../common/angleutils_unittest.cpp", "../common/bitset_utils_unittest.cpp", @@ -26,8 +26,8 @@ angle_unittests_sources = [ "../libANGLE/Fence_unittest.cpp", "../libANGLE/HandleAllocator_unittest.cpp", "../libANGLE/HandleRangeAllocator_unittest.cpp", - "../libANGLE/Image_unittest.cpp", "../libANGLE/ImageIndexIterator_unittest.cpp", + "../libANGLE/Image_unittest.cpp", "../libANGLE/Observer_unittest.cpp", "../libANGLE/Program_unittest.cpp", "../libANGLE/ResourceManager_unittest.cpp", @@ -40,43 +40,45 @@ angle_unittests_sources = [ "../libANGLE/WorkerThread_unittest.cpp", "../libANGLE/renderer/BufferImpl_mock.h", "../libANGLE/renderer/FramebufferImpl_mock.h", + "../libANGLE/renderer/ImageImpl_mock.h", "../libANGLE/renderer/ProgramImpl_mock.h", "../libANGLE/renderer/RenderbufferImpl_mock.h", - "../libANGLE/renderer/ImageImpl_mock.h", "../libANGLE/renderer/TextureImpl_mock.h", "../libANGLE/renderer/TransformFeedbackImpl_mock.h", "../tests/angle_unittests_utils.h", "../tests/compiler_tests/API_test.cpp", - "../tests/compiler_tests/AppendixALimitations_test.cpp", "../tests/compiler_tests/ARB_texture_rectangle_test.cpp", + "../tests/compiler_tests/AppendixALimitations_test.cpp", "../tests/compiler_tests/AtomicCounter_test.cpp", "../tests/compiler_tests/BufferVariables_test.cpp", "../tests/compiler_tests/CollectVariables_test.cpp", - "../tests/compiler_tests/ConstantFolding_test.cpp", "../tests/compiler_tests/ConstantFoldingNaN_test.cpp", "../tests/compiler_tests/ConstantFoldingOverflow_test.cpp", + "../tests/compiler_tests/ConstantFolding_test.cpp", "../tests/compiler_tests/ConstructCompiler_test.cpp", "../tests/compiler_tests/DebugShaderPrecision_test.cpp", - "../tests/compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp", - "../tests/compiler_tests/EmulateGLDrawID_test.cpp", - "../tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp", - "../tests/compiler_tests/ExpressionLimit_test.cpp", "../tests/compiler_tests/EXT_YUV_target_test.cpp", "../tests/compiler_tests/EXT_blend_func_extended_test.cpp", "../tests/compiler_tests/EXT_frag_depth_test.cpp", "../tests/compiler_tests/EXT_shader_texture_lod_test.cpp", + "../tests/compiler_tests/EmulateGLBaseVertexBaseInstance_test.cpp", + "../tests/compiler_tests/EmulateGLDrawID_test.cpp", + "../tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp", + "../tests/compiler_tests/ExpressionLimit_test.cpp", "../tests/compiler_tests/ExtensionDirective_test.cpp", "../tests/compiler_tests/FloatLex_test.cpp", "../tests/compiler_tests/FragDepth_test.cpp", "../tests/compiler_tests/GLSLCompatibilityOutput_test.cpp", - "../tests/compiler_tests/GlFragDataNotModified_test.cpp", "../tests/compiler_tests/GeometryShader_test.cpp", + "../tests/compiler_tests/GlFragDataNotModified_test.cpp", "../tests/compiler_tests/ImmutableString_test.cpp", "../tests/compiler_tests/ImmutableString_test_autogen.cpp", "../tests/compiler_tests/InitOutputVariables_test.cpp", "../tests/compiler_tests/IntermNode_test.cpp", "../tests/compiler_tests/NV_draw_buffers_test.cpp", "../tests/compiler_tests/OES_standard_derivatives_test.cpp", + "../tests/compiler_tests/OVR_multiview2_test.cpp", + "../tests/compiler_tests/OVR_multiview_test.cpp", "../tests/compiler_tests/Pack_Unpack_test.cpp", "../tests/compiler_tests/PruneEmptyCases_test.cpp", "../tests/compiler_tests/PruneEmptyDeclarations_test.cpp", @@ -91,20 +93,21 @@ angle_unittests_sources = [ "../tests/compiler_tests/RewriteDoWhile_test.cpp", "../tests/compiler_tests/SamplerMultisample_test.cpp", "../tests/compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp", + "../tests/compiler_tests/ShCompile_test.cpp", "../tests/compiler_tests/ShaderImage_test.cpp", "../tests/compiler_tests/ShaderValidation_test.cpp", "../tests/compiler_tests/ShaderVariable_test.cpp", - "../tests/compiler_tests/ShCompile_test.cpp", "../tests/compiler_tests/TextureFunction_test.cpp", - "../tests/compiler_tests/Type_test.cpp", "../tests/compiler_tests/TypeTracking_test.cpp", + "../tests/compiler_tests/Type_test.cpp", "../tests/compiler_tests/UnfoldShortCircuitAST_test.cpp", "../tests/compiler_tests/VariablePacker_test.cpp", "../tests/compiler_tests/VectorizeVectorScalarArithmetic_test.cpp", - "../tests/compiler_tests/OVR_multiview_test.cpp", - "../tests/compiler_tests/OVR_multiview2_test.cpp", "../tests/compiler_tests/WorkGroupSize_test.cpp", - "../tests/test_expectations/GPUTestExpectationsParser_unittest.cpp", + "../tests/preprocessor_tests/MockDiagnostics.h", + "../tests/preprocessor_tests/MockDirectiveHandler.h", + "../tests/preprocessor_tests/PreprocessorTest.cpp", + "../tests/preprocessor_tests/PreprocessorTest.h", "../tests/preprocessor_tests/char_test.cpp", "../tests/preprocessor_tests/comment_test.cpp", "../tests/preprocessor_tests/define_test.cpp", @@ -114,23 +117,20 @@ angle_unittests_sources = [ "../tests/preprocessor_tests/if_test.cpp", "../tests/preprocessor_tests/input_test.cpp", "../tests/preprocessor_tests/location_test.cpp", - "../tests/preprocessor_tests/MockDiagnostics.h", - "../tests/preprocessor_tests/MockDirectiveHandler.h", "../tests/preprocessor_tests/number_test.cpp", "../tests/preprocessor_tests/operator_test.cpp", "../tests/preprocessor_tests/pragma_test.cpp", - "../tests/preprocessor_tests/PreprocessorTest.cpp", - "../tests/preprocessor_tests/PreprocessorTest.h", "../tests/preprocessor_tests/space_test.cpp", "../tests/preprocessor_tests/token_test.cpp", "../tests/preprocessor_tests/version_test.cpp", - "../tests/test_utils/compiler_test.cpp", - "../tests/test_utils/compiler_test.h", - "../tests/test_utils/ConstantFoldingTest.h", + "../tests/test_expectations/GPUTestExpectationsParser_unittest.cpp", "../tests/test_utils/ConstantFoldingTest.cpp", - "../tests/test_utils/ShaderCompileTreeTest.h", + "../tests/test_utils/ConstantFoldingTest.h", "../tests/test_utils/ShaderCompileTreeTest.cpp", + "../tests/test_utils/ShaderCompileTreeTest.h", "../tests/test_utils/ShaderExtensionTest.h", + "../tests/test_utils/compiler_test.cpp", + "../tests/test_utils/compiler_test.h", ] # TODO(jmadill): should probably call this windows sources diff --git a/skia/third_party/externals/angle2/src/tests/angle_white_box_tests.gni b/skia/third_party/externals/angle2/src/tests/angle_white_box_tests.gni index cc736f3b753da837c11970e4414da92ab61dcb96..fc4e81a413296422d1ae5e3d715125f5a62fec32 100644 --- a/skia/third_party/externals/angle2/src/tests/angle_white_box_tests.gni +++ b/skia/third_party/externals/angle2/src/tests/angle_white_box_tests.gni @@ -4,14 +4,14 @@ angle_white_box_tests_sources = [ "egl_tests/EGLFeatureControlTest.cpp", - "util_tests/PrintSystemInfoTest.cpp", + "test_utils/ANGLETest.cpp", + "test_utils/ANGLETest.h", "test_utils/angle_test_configs.cpp", "test_utils/angle_test_configs.h", "test_utils/angle_test_instantiate.cpp", "test_utils/angle_test_instantiate.h", - "test_utils/ANGLETest.cpp", - "test_utils/ANGLETest.h", "test_utils/gl_raii.h", + "util_tests/PrintSystemInfoTest.cpp", ] angle_white_box_tests_win_sources = [ "egl_tests/EGLDirectCompositionTest.cpp", diff --git a/skia/third_party/externals/angle2/src/tests/deqp.gni b/skia/third_party/externals/angle2/src/tests/deqp.gni index e993b751f8e30278e37edfd0da0ac0fdda2ad5ce..701e1d224a73286a7a75d3944afdcb757f6cca95 100644 --- a/skia/third_party/externals/angle2/src/tests/deqp.gni +++ b/skia/third_party/externals/angle2/src/tests/deqp.gni @@ -249,10 +249,10 @@ deqp_gles3_sources = [ "$deqp_path/modules/gles3/accuracy/es3aTextureMipmapTests.hpp", "$deqp_path/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp", "$deqp_path/modules/gles3/accuracy/es3aVaryingInterpolationTests.hpp", - "$deqp_path/modules/gles3/functional/es3fApiCase.cpp", - "$deqp_path/modules/gles3/functional/es3fApiCase.hpp", "$deqp_path/modules/gles3/functional/es3fASTCDecompressionCases.cpp", "$deqp_path/modules/gles3/functional/es3fASTCDecompressionCases.hpp", + "$deqp_path/modules/gles3/functional/es3fApiCase.cpp", + "$deqp_path/modules/gles3/functional/es3fApiCase.hpp", "$deqp_path/modules/gles3/functional/es3fAttribLocationTests.cpp", "$deqp_path/modules/gles3/functional/es3fAttribLocationTests.hpp", "$deqp_path/modules/gles3/functional/es3fBlendTests.cpp", @@ -317,10 +317,10 @@ deqp_gles3_sources = [ "$deqp_path/modules/gles3/functional/es3fFlushFinishTests.hpp", "$deqp_path/modules/gles3/functional/es3fFragDepthTests.cpp", "$deqp_path/modules/gles3/functional/es3fFragDepthTests.hpp", - "$deqp_path/modules/gles3/functional/es3fFragmentOutputTests.cpp", - "$deqp_path/modules/gles3/functional/es3fFragmentOutputTests.hpp", "$deqp_path/modules/gles3/functional/es3fFragOpInteractionTests.cpp", "$deqp_path/modules/gles3/functional/es3fFragOpInteractionTests.hpp", + "$deqp_path/modules/gles3/functional/es3fFragmentOutputTests.cpp", + "$deqp_path/modules/gles3/functional/es3fFragmentOutputTests.hpp", "$deqp_path/modules/gles3/functional/es3fFramebufferBlitTests.cpp", "$deqp_path/modules/gles3/functional/es3fFramebufferBlitTests.hpp", "$deqp_path/modules/gles3/functional/es3fFunctionalTests.cpp", @@ -403,10 +403,10 @@ deqp_gles3_sources = [ "$deqp_path/modules/gles3/functional/es3fShaderInvarianceTests.hpp", "$deqp_path/modules/gles3/functional/es3fShaderLoopTests.cpp", "$deqp_path/modules/gles3/functional/es3fShaderLoopTests.hpp", - "$deqp_path/modules/gles3/functional/es3fShaderMetamorphicTests.cpp", - "$deqp_path/modules/gles3/functional/es3fShaderMetamorphicTests.hpp", "$deqp_path/modules/gles3/functional/es3fShaderMatrixTests.cpp", "$deqp_path/modules/gles3/functional/es3fShaderMatrixTests.hpp", + "$deqp_path/modules/gles3/functional/es3fShaderMetamorphicTests.cpp", + "$deqp_path/modules/gles3/functional/es3fShaderMetamorphicTests.hpp", "$deqp_path/modules/gles3/functional/es3fShaderOperatorTests.cpp", "$deqp_path/modules/gles3/functional/es3fShaderOperatorTests.hpp", "$deqp_path/modules/gles3/functional/es3fShaderPackingFunctionTests.cpp", @@ -595,6 +595,8 @@ deqp_gles31_sources = [ "$deqp_path/modules/gles31/functional/es31fNegativeFragmentApiTests.hpp", "$deqp_path/modules/gles31/functional/es31fNegativePreciseTests.cpp", "$deqp_path/modules/gles31/functional/es31fNegativePreciseTests.hpp", + "$deqp_path/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp", + "$deqp_path/modules/gles31/functional/es31fNegativeSSBOBlockTests.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeSampleVariablesTests.cpp", "$deqp_path/modules/gles31/functional/es31fNegativeSampleVariablesTests.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeShaderApiTests.cpp", @@ -609,14 +611,12 @@ deqp_gles31_sources = [ "$deqp_path/modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeShaderStorageTests.cpp", "$deqp_path/modules/gles31/functional/es31fNegativeShaderStorageTests.hpp", - "$deqp_path/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp", - "$deqp_path/modules/gles31/functional/es31fNegativeSSBOBlockTests.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeStateApiTests.cpp", "$deqp_path/modules/gles31/functional/es31fNegativeStateApiTests.hpp", - "$deqp_path/modules/gles31/functional/es31fNegativeTestShared.cpp", - "$deqp_path/modules/gles31/functional/es31fNegativeTestShared.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeTessellationTests.cpp", "$deqp_path/modules/gles31/functional/es31fNegativeTessellationTests.hpp", + "$deqp_path/modules/gles31/functional/es31fNegativeTestShared.cpp", + "$deqp_path/modules/gles31/functional/es31fNegativeTestShared.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeTextureApiTests.cpp", "$deqp_path/modules/gles31/functional/es31fNegativeTextureApiTests.hpp", "$deqp_path/modules/gles31/functional/es31fNegativeVertexArrayApiTests.cpp", @@ -737,7 +737,8 @@ deqp_gles31_sources = [ "$deqp_path/modules/gles31/tes31TestPackageEntry.cpp", # Overrides - "deqp_support/tes31Context_override.cpp", # 3688/3687: Override to prevent 3.2 context creation + "deqp_support/tes31Context_override.cpp", # 3688/3687: Override to prevent + # 3.2 context creation ] deqp_egl_sources = [ @@ -765,10 +766,6 @@ deqp_egl_sources = [ "$deqp_path/modules/egl/teglCreateContextTests.hpp", "$deqp_path/modules/egl/teglCreateSurfaceTests.cpp", "$deqp_path/modules/egl/teglCreateSurfaceTests.hpp", - "$deqp_path/modules/egl/teglGetFrameTimestampsTests.cpp", - "$deqp_path/modules/egl/teglGetFrameTimestampsTests.hpp", - "$deqp_path/modules/egl/teglGetProcAddressTests.cpp", - "$deqp_path/modules/egl/teglGetProcAddressTests.hpp", "$deqp_path/modules/egl/teglGLES1RenderUtil.cpp", "$deqp_path/modules/egl/teglGLES1RenderUtil.hpp", "$deqp_path/modules/egl/teglGLES2RenderUtil.cpp", @@ -779,6 +776,10 @@ deqp_egl_sources = [ "$deqp_path/modules/egl/teglGLES2SharingTests.hpp", "$deqp_path/modules/egl/teglGLES2SharingThreadedTests.cpp", "$deqp_path/modules/egl/teglGLES2SharingThreadedTests.hpp", + "$deqp_path/modules/egl/teglGetFrameTimestampsTests.cpp", + "$deqp_path/modules/egl/teglGetFrameTimestampsTests.hpp", + "$deqp_path/modules/egl/teglGetProcAddressTests.cpp", + "$deqp_path/modules/egl/teglGetProcAddressTests.hpp", "$deqp_path/modules/egl/teglImageFormatTests.cpp", "$deqp_path/modules/egl/teglImageFormatTests.hpp", "$deqp_path/modules/egl/teglImageTests.cpp", @@ -805,10 +806,10 @@ deqp_egl_sources = [ "$deqp_path/modules/egl/teglNegativeApiTests.hpp", "$deqp_path/modules/egl/teglNegativePartialUpdateTests.cpp", "$deqp_path/modules/egl/teglNegativePartialUpdateTests.hpp", - "$deqp_path/modules/egl/teglPreservingSwapTests.cpp", - "$deqp_path/modules/egl/teglPreservingSwapTests.hpp", "$deqp_path/modules/egl/teglPartialUpdateTests.cpp", "$deqp_path/modules/egl/teglPartialUpdateTests.hpp", + "$deqp_path/modules/egl/teglPreservingSwapTests.cpp", + "$deqp_path/modules/egl/teglPreservingSwapTests.hpp", "$deqp_path/modules/egl/teglQueryConfigTests.cpp", "$deqp_path/modules/egl/teglQueryConfigTests.hpp", "$deqp_path/modules/egl/teglQueryContextTests.cpp", @@ -1029,19 +1030,19 @@ deqp_khr_gl_sources = [ "$deqp_path/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cDirectStateAccessVertexArraysTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cDirectStateAccessXFBTests.cpp", - "$deqp_path/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp", - "$deqp_path/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp", "$deqp_path/external/openglcts/modules/gl/gl4cES31CompatibilitySampleVariablesTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cES31CompatibilityShaderImageLoadStoreTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cES31CompatibilityShaderStorageBufferObjectTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cES31CompatibilityTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cES31CompatibilityTests.hpp", + "$deqp_path/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp", + "$deqp_path/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp", + "$deqp_path/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp", + "$deqp_path/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.hpp", "$deqp_path/external/openglcts/modules/gl/gl4cGetTextureSubImageTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cGetTextureSubImageTests.hpp", "$deqp_path/external/openglcts/modules/gl/gl4cGlSpirvTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cGlSpirvTests.hpp", - "$deqp_path/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp", - "$deqp_path/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.hpp", "$deqp_path/external/openglcts/modules/gl/gl4cIncompleteTextureAccessTests.cpp", "$deqp_path/external/openglcts/modules/gl/gl4cIncompleteTextureAccessTests.hpp", "$deqp_path/external/openglcts/modules/gl/gl4cIndirectParametersTests.cpp", @@ -1155,14 +1156,14 @@ deqp_khr_gles31_sources = [ "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleDependenciesTests.hpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleFunctionalTests.cpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleFunctionalTests.hpp", + "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGLCoverageTests.cpp", + "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGLCoverageTests.hpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGetActiveUniformTests.cpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGetActiveUniformTests.hpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGetMultisamplefvTests.cpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGetMultisamplefvTests.hpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGetTexLevelParameterifvTests.cpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGetTexLevelParameterifvTests.hpp", - "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGLCoverageTests.cpp", - "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleGLCoverageTests.hpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleSampleMaskiTests.cpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleSampleMaskiTests.hpp", "$deqp_path/external/openglcts/modules/gles31/es31cTextureStorageMultisampleTests.cpp", @@ -1199,12 +1200,12 @@ deqp_khr_glesext_sources = [ "$deqp_path/external/openglcts/modules/glesext/draw_buffers_indexed/esextcDrawBuffersIndexedSetGet.hpp", "$deqp_path/external/openglcts/modules/glesext/draw_buffers_indexed/esextcDrawBuffersIndexedTests.cpp", "$deqp_path/external/openglcts/modules/glesext/draw_elements_base_vertex/esextcDrawElementsBaseVertexTests.cpp", + "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.cpp", + "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.hpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAdjacency.cpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAdjacency.hpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAdjacencyTests.cpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAdjacencyTests.hpp", - "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.cpp", - "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.hpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderBlitting.cpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderBlitting.hpp", "$deqp_path/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderClipping.cpp", @@ -1252,10 +1253,10 @@ deqp_khr_glesext_sources = [ "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5ImagesArrayIndexing.hpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5PreciseQualifier.cpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5PreciseQualifier.hpp", - "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5SamplerArrayIndexing.cpp", - "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5SamplerArrayIndexing.hpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5SSBOArrayIndexing.cpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5SSBOArrayIndexing.hpp", + "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5SamplerArrayIndexing.cpp", + "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5SamplerArrayIndexing.hpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5Tests.cpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5TextureGatherOffset.cpp", "$deqp_path/external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5TextureGatherOffset.hpp", @@ -1330,10 +1331,10 @@ deqp_khr_glesext_sources = [ "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferMAXSizeValidation.hpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferOperations.cpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferOperations.hpp", - "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferParameters.cpp", - "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferParameters.hpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferParamValueIntToFloatConversion.cpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferParamValueIntToFloatConversion.hpp", + "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferParameters.cpp", + "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferParameters.hpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferPrecision.cpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferPrecision.hpp", "$deqp_path/external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferTests.cpp", @@ -1468,6 +1469,8 @@ deqp_framework_decpp_sources = [ "$deqp_path/framework/delibs/decpp/deRandom.hpp", "$deqp_path/framework/delibs/decpp/deRingBuffer.cpp", "$deqp_path/framework/delibs/decpp/deRingBuffer.hpp", + "$deqp_path/framework/delibs/decpp/deSTLUtil.cpp", + "$deqp_path/framework/delibs/decpp/deSTLUtil.hpp", "$deqp_path/framework/delibs/decpp/deSemaphore.cpp", "$deqp_path/framework/delibs/decpp/deSemaphore.hpp", "$deqp_path/framework/delibs/decpp/deSha1.cpp", @@ -1478,8 +1481,6 @@ deqp_framework_decpp_sources = [ "$deqp_path/framework/delibs/decpp/deSocket.hpp", "$deqp_path/framework/delibs/decpp/deSpinBarrier.cpp", "$deqp_path/framework/delibs/decpp/deSpinBarrier.hpp", - "$deqp_path/framework/delibs/decpp/deSTLUtil.cpp", - "$deqp_path/framework/delibs/decpp/deSTLUtil.hpp", "$deqp_path/framework/delibs/decpp/deStringUtil.cpp", "$deqp_path/framework/delibs/decpp/deStringUtil.hpp", "$deqp_path/framework/delibs/decpp/deThread.cpp", @@ -1567,10 +1568,10 @@ deqp_framework_opengl_sources = [ "$deqp_path/framework/opengl/wrapper/glwEnums.hpp", "$deqp_path/framework/opengl/wrapper/glwEnums.inl", "$deqp_path/framework/opengl/wrapper/glwFunctionLoader.hpp", + "$deqp_path/framework/opengl/wrapper/glwFunctionTypes.inl", "$deqp_path/framework/opengl/wrapper/glwFunctions.cpp", "$deqp_path/framework/opengl/wrapper/glwFunctions.hpp", "$deqp_path/framework/opengl/wrapper/glwFunctions.inl", - "$deqp_path/framework/opengl/wrapper/glwFunctionTypes.inl", "$deqp_path/framework/opengl/wrapper/glwImpl.inl", "$deqp_path/framework/opengl/wrapper/glwInitES20.inl", "$deqp_path/framework/opengl/wrapper/glwInitES20Direct.cpp", @@ -1657,10 +1658,10 @@ deqp_framework_egl_sources = [ "$deqp_path/framework/egl/wrapper/eglwEnumsC.inl", "$deqp_path/framework/egl/wrapper/eglwFuncPtrLibraryDecl.inl", "$deqp_path/framework/egl/wrapper/eglwFuncPtrLibraryImpl.inl", + "$deqp_path/framework/egl/wrapper/eglwFunctionTypes.inl", "$deqp_path/framework/egl/wrapper/eglwFunctions.cpp", "$deqp_path/framework/egl/wrapper/eglwFunctions.hpp", "$deqp_path/framework/egl/wrapper/eglwFunctions.inl", - "$deqp_path/framework/egl/wrapper/eglwFunctionTypes.inl", "$deqp_path/framework/egl/wrapper/eglwImpl.inl", "$deqp_path/framework/egl/wrapper/eglwImplExt.inl", "$deqp_path/framework/egl/wrapper/eglwInitCore.inl", @@ -1684,12 +1685,12 @@ deqp_framework_common_sources = [ "$deqp_path/framework/common/tcuAstcUtil.hpp", "$deqp_path/framework/common/tcuBilinearImageCompare.cpp", "$deqp_path/framework/common/tcuBilinearImageCompare.hpp", + "$deqp_path/framework/common/tcuCPUWarmup.cpp", + "$deqp_path/framework/common/tcuCPUWarmup.hpp", "$deqp_path/framework/common/tcuCommandLine.cpp", "$deqp_path/framework/common/tcuCommandLine.hpp", "$deqp_path/framework/common/tcuCompressedTexture.cpp", "$deqp_path/framework/common/tcuCompressedTexture.hpp", - "$deqp_path/framework/common/tcuCPUWarmup.cpp", - "$deqp_path/framework/common/tcuCPUWarmup.hpp", "$deqp_path/framework/common/tcuDefs.cpp", "$deqp_path/framework/common/tcuDefs.hpp", "$deqp_path/framework/common/tcuEither.cpp", @@ -1719,6 +1720,8 @@ deqp_framework_common_sources = [ "$deqp_path/framework/common/tcuPixelFormat.hpp", "$deqp_path/framework/common/tcuPlatform.cpp", "$deqp_path/framework/common/tcuPlatform.hpp", + "$deqp_path/framework/common/tcuRGBA.cpp", + "$deqp_path/framework/common/tcuRGBA.hpp", "$deqp_path/framework/common/tcuRandomValueIterator.cpp", "$deqp_path/framework/common/tcuRandomValueIterator.hpp", "$deqp_path/framework/common/tcuRasterizationVerifier.cpp", @@ -1729,11 +1732,9 @@ deqp_framework_common_sources = [ "$deqp_path/framework/common/tcuResource.hpp", "$deqp_path/framework/common/tcuResultCollector.cpp", "$deqp_path/framework/common/tcuResultCollector.hpp", - "$deqp_path/framework/common/tcuRGBA.cpp", - "$deqp_path/framework/common/tcuRGBA.hpp", + "$deqp_path/framework/common/tcuSRGB8Lut.inl", "$deqp_path/framework/common/tcuSeedBuilder.cpp", "$deqp_path/framework/common/tcuSeedBuilder.hpp", - "$deqp_path/framework/common/tcuSRGB8Lut.inl", "$deqp_path/framework/common/tcuStringTemplate.cpp", "$deqp_path/framework/common/tcuStringTemplate.hpp", "$deqp_path/framework/common/tcuSurface.cpp", @@ -1758,12 +1759,12 @@ deqp_framework_common_sources = [ "$deqp_path/framework/common/tcuTexCompareVerifier.hpp", "$deqp_path/framework/common/tcuTexLookupVerifier.cpp", "$deqp_path/framework/common/tcuTexLookupVerifier.hpp", + "$deqp_path/framework/common/tcuTexVerifierUtil.cpp", + "$deqp_path/framework/common/tcuTexVerifierUtil.hpp", "$deqp_path/framework/common/tcuTexture.cpp", "$deqp_path/framework/common/tcuTexture.hpp", "$deqp_path/framework/common/tcuTextureUtil.cpp", "$deqp_path/framework/common/tcuTextureUtil.hpp", - "$deqp_path/framework/common/tcuTexVerifierUtil.cpp", - "$deqp_path/framework/common/tcuTexVerifierUtil.hpp", "$deqp_path/framework/common/tcuThreadUtil.cpp", "$deqp_path/framework/common/tcuThreadUtil.hpp", "$deqp_path/framework/common/tcuVector.hpp", @@ -1830,9 +1831,9 @@ deqp_framework_common_sources = [ "$deqp_path/framework/referencerenderer/rrPrimitiveTypes.hpp", "$deqp_path/framework/referencerenderer/rrRasterizer.cpp", "$deqp_path/framework/referencerenderer/rrRasterizer.hpp", + "$deqp_path/framework/referencerenderer/rrRenderState.hpp", "$deqp_path/framework/referencerenderer/rrRenderer.cpp", "$deqp_path/framework/referencerenderer/rrRenderer.hpp", - "$deqp_path/framework/referencerenderer/rrRenderState.hpp", "$deqp_path/framework/referencerenderer/rrShaders.cpp", "$deqp_path/framework/referencerenderer/rrShaders.hpp", "$deqp_path/framework/referencerenderer/rrShadingContext.cpp", @@ -1873,10 +1874,10 @@ deqp_glshared_sources = [ "$deqp_path/modules/glshared/glsFboCompletenessTests.hpp", "$deqp_path/modules/glshared/glsFboUtil.cpp", "$deqp_path/modules/glshared/glsFboUtil.hpp", - "$deqp_path/modules/glshared/glsFragmentOpUtil.cpp", - "$deqp_path/modules/glshared/glsFragmentOpUtil.hpp", "$deqp_path/modules/glshared/glsFragOpInteractionCase.cpp", "$deqp_path/modules/glshared/glsFragOpInteractionCase.hpp", + "$deqp_path/modules/glshared/glsFragmentOpUtil.cpp", + "$deqp_path/modules/glshared/glsFragmentOpUtil.hpp", "$deqp_path/modules/glshared/glsInteractionTestUtil.cpp", "$deqp_path/modules/glshared/glsInteractionTestUtil.hpp", "$deqp_path/modules/glshared/glsLifetimeTests.cpp", diff --git a/skia/third_party/externals/angle2/third_party/BUILD.gn b/skia/third_party/externals/angle2/third_party/BUILD.gn index eacbfc14c7f9076292874125b0f9331af49ba608..462f4d4f7f83e6322e5775d12521390d31431daf 100644 --- a/skia/third_party/externals/angle2/third_party/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/BUILD.gn @@ -25,14 +25,10 @@ group("jpeg") { if (use_system_libjpeg) { public_configs = [ ":system_libjpeg_config" ] } else if (use_libjpeg_turbo) { - public_deps = [ - "//third_party/libjpeg_turbo:libjpeg", - ] + public_deps = [ "//third_party/libjpeg_turbo:libjpeg" ] public_configs = [ ":libjpeg_turbo_config" ] } else { - public_deps = [ - "//third_party/libjpeg:libjpeg", - ] + public_deps = [ "//third_party/libjpeg:libjpeg" ] } } diff --git a/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn b/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn index 25ae133986af8fb4d2275632e75e938040d87b0d..a5604da601c0d091c8d97f7721330d8dc86ebb21 100644 --- a/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn @@ -73,9 +73,7 @@ group("glmark2_gles") { ":glmark2_common_config", ":glmark2_gles_config", ] - public_deps = [ - ":glmark2_glad_gles", - ] + public_deps = [ ":glmark2_glad_gles" ] } group("glmark2_gl") { @@ -83,9 +81,7 @@ group("glmark2_gl") { ":glmark2_common_config", ":glmark2_gl_config", ] - public_deps = [ - ":glmark2_glad_gl", - ] + public_deps = [ ":glmark2_glad_gl" ] } # Supplies compatible headers on Win32. @@ -156,23 +152,17 @@ template("glmark2_libmatrix") { if (is_clang) { cflags_cc = [ "-Wno-implicit-fallthrough" ] } - public_deps = [ - ":glmark2_headers", - ] + public_deps = [ ":glmark2_headers" ] public_configs = [ ":glmark2_libmatrix_config" ] } } glmark2_libmatrix("glmark2_libmatrix_gles") { - deps = [ - ":glmark2_gles", - ] + deps = [ ":glmark2_gles" ] } glmark2_libmatrix("glmark2_libmatrix_gl") { - deps = [ - ":glmark2_gl", - ] + deps = [ ":glmark2_gl" ] } config("glmark2_scene_ideas_config") { @@ -345,9 +335,7 @@ template("glmark2_exe") { "src/src/canvas-generic.h", "src/src/main.cpp", ] - data = [ - "src/data/", - ] + data = [ "src/data/" ] defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ] @@ -370,12 +358,8 @@ template("glmark2_exe") { } glmark2_exe("glmark2_angle") { - sources = [ - "src/src/gl-state-egl.cpp", - ] - deps = [ - ":glmark2_common_gles", - ] + sources = [ "src/src/gl-state-egl.cpp" ] + deps = [ ":glmark2_common_gles" ] data_deps = [ "${angle_root}:libEGL", "${angle_root}:libGLESv2", @@ -399,9 +383,7 @@ if (is_linux) { "src/src/glad/include/glad/glx.h", "src/src/glad/src/glx.c", ] - deps = [ - ":glmark2_common_gl", - ] + deps = [ ":glmark2_common_gl" ] defines = [ "GLMARK2_USE_GLX" ] } @@ -410,12 +392,8 @@ if (is_linux) { # opengl32.lib/opengl32.dll are not available on Windows ARM64. if (is_win && target_cpu != "arm64") { glmark2_exe("glmark2_wgl") { - sources = [ - "src/src/gl-state-wgl.cpp", - ] - deps = [ - ":glmark2_common_gl", - ] + sources = [ "src/src/gl-state-wgl.cpp" ] + deps = [ ":glmark2_common_gl" ] libs = [ "opengl32.lib" ] defines = [ "GLMARK2_USE_WGL" ] diff --git a/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn b/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn index e57015985b151d6e91ebb976fed74bb4a0225d16..fa0012075c076f9d18f6ce11773d10c3754368de 100644 --- a/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn @@ -29,7 +29,5 @@ static_library("libpng") { } configs -= [ "//build/config/compiler:chromium_code" ] public_configs = [ ":libpng_config" ] - deps = [ - "//third_party/zlib:zlib", - ] + deps = [ "//third_party/zlib:zlib" ] } diff --git a/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn b/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn index a919a76f54313db0beb111733d7c429905ddbe42..5e70aa3232bfc6a16c2e2f24bc60ae766e53350f 100644 --- a/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn @@ -94,9 +94,7 @@ copy("python_gen_deps") { "src/scripts/loader_extension_generator.py", "src/scripts/loader_genvk.py", ] - outputs = [ - "$vulkan_gen_dir/{{source_file_part}}", - ] + outputs = [ "$vulkan_gen_dir/{{source_file_part}}" ] } foreach(script_and_dep, helper_script_and_deps) { @@ -104,17 +102,13 @@ foreach(script_and_dep, helper_script_and_deps) { file = script_and_dep[1] dep = script_and_dep[2] target("action", target_name) { - public_deps = [ - ":python_gen_deps", - ] + public_deps = [ ":python_gen_deps" ] script = "$vulkan_gen_dir/loader_genvk.py" inputs = [ "$vulkan_gen_dir/$dep", "$vulkan_gen_dir/common_codegen.py", ] - outputs = [ - "$vulkan_gen_dir/$file", - ] + outputs = [ "$vulkan_gen_dir/$file" ] args = [ "-o", raw_vulkan_gen_dir, @@ -133,9 +127,7 @@ config("vulkan_generated_files_config") { } group("vulkan_generate_helper_files") { - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] public_configs = [ ":vulkan_generated_files_config" ] foreach(script_and_dep, helper_script_and_deps) { target_name = script_and_dep[0] @@ -224,20 +216,18 @@ if (!is_android) { "/wd4100", # Unreferenced formal parameter "/wd4152", # Nonstandard extension used (pointer conversion) "/wd4201", # Nonstandard extension used: nameless struct/union - "/wd4214", # Nonstandard extension used: bit field types other than int - "/wd4232", # Nonstandard extension used: address of dllimport is not static + "/wd4214", # Nonstandard extension used: bit field types other than + # int + "/wd4232", # Nonstandard extension used: address of dllimport is not + # static "/wd4305", # Type cast truncation "/wd4706", # Assignment within conditional expression "/wd4996", # Unsafe stdlib function ] } } - deps = [ - ":vulkan_generate_helper_files", - ] - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + deps = [ ":vulkan_generate_helper_files" ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":vulkan_internal_config" ] diff --git a/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn b/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn index 0fe1abd18ec596fde9611d0e2a096dfea029f09d..d2a837cf555a9afc4491708309fd1f6d2eaec715 100644 --- a/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn @@ -59,9 +59,7 @@ copy("python_gen_deps") { "src/scripts/mock_icd_generator.py", "src/scripts/vulkan_tools_helper_file_generator.py", ] - outputs = [ - "$vulkan_gen_dir/{{source_file_part}}", - ] + outputs = [ "$vulkan_gen_dir/{{source_file_part}}" ] } foreach(script_and_dep, helper_script_and_deps) { @@ -69,17 +67,13 @@ foreach(script_and_dep, helper_script_and_deps) { file = script_and_dep[1] dep = script_and_dep[2] target("action", target_name) { - public_deps = [ - ":python_gen_deps", - ] + public_deps = [ ":python_gen_deps" ] script = "$vulkan_gen_dir/kvt_genvk.py" inputs = [ "$vulkan_gen_dir/$dep", "$vulkan_gen_dir/common_codegen.py", ] - outputs = [ - "$vulkan_gen_dir/$file", - ] + outputs = [ "$vulkan_gen_dir/$file" ] args = [ "-o", raw_vulkan_gen_dir, @@ -98,9 +92,7 @@ config("vulkan_generated_files_config") { } group("vulkan_generate_helper_files") { - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] public_configs = [ ":vulkan_generated_files_config" ] foreach(script_and_dep, helper_script_and_deps) { target_name = script_and_dep[0] @@ -124,12 +116,9 @@ config("vulkan_internal_config") { # Copy icd header to gen dir copy("icd_header_dep") { - sources = [ - "$angle_root/third_party/vulkan-headers/src/include/vulkan/vk_icd.h", - ] - outputs = [ - "$vulkan_gen_dir/vk_icd.h", - ] + sources = + [ "$angle_root/third_party/vulkan-headers/src/include/vulkan/vk_icd.h" ] + outputs = [ "$vulkan_gen_dir/vk_icd.h" ] } if (!is_android) { @@ -152,12 +141,8 @@ if (!is_android) { shared_library("VkICD_mock_icd") { configs -= vulkan_undefine_configs public_configs = [ "$angle_root:vulkan_config" ] - deps = [ - ":vulkan_generate_mock_icd_files", - ] - data_deps = [ - ":vulkan_gen_icd_json_file", - ] + deps = [ ":vulkan_generate_mock_icd_files" ] + data_deps = [ ":vulkan_gen_icd_json_file" ] sources = mock_icd_sources if (is_win) { sources += [ "src/icd/VkICD_mock_icd.def" ] @@ -168,9 +153,7 @@ if (!is_android) { action("vulkan_gen_icd_json_file") { script = "$angle_root/scripts/generate_vulkan_layers_json.py" - sources = [ - "../vulkan-headers/src/include/vulkan/vulkan_core.h", - ] + sources = [ "../vulkan-headers/src/include/vulkan/vulkan_core.h" ] args = [ "--icd" ] if (is_win) { sources += [ "src/icd/windows/VkICD_mock_icd.json" ] @@ -182,9 +165,7 @@ if (!is_android) { } # The layer JSON files are part of the necessary data deps. - outputs = [ - "$root_out_dir/$angle_data_dir/VkICD_mock_icd.json", - ] + outputs = [ "$root_out_dir/$angle_data_dir/VkICD_mock_icd.json" ] data = outputs args += [ rebase_path("$root_out_dir/$angle_data_dir", root_build_dir) ] + rebase_path(sources, root_build_dir) diff --git a/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn b/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn index 36e0800d42e98497407d08228af8f43df10e6858..d2d5f552fb13f6b5a55ad2cbd61fbf775cc2faf7 100644 --- a/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn @@ -142,9 +142,7 @@ copy("python_gen_deps") { "src/scripts/layer_chassis_generator.py", "src/scripts/layer_chassis_dispatch_generator.py", ] - outputs = [ - "$vulkan_gen_dir/{{source_file_part}}", - ] + outputs = [ "$vulkan_gen_dir/{{source_file_part}}" ] } # This special action is needed to remove previously-generated header files. @@ -152,12 +150,8 @@ copy("python_gen_deps") { # failures. action("vulkan_clean_gen_headers") { script = "$angle_root/scripts/remove_files.py" - deps = [ - ":python_gen_deps", - ] - outputs = [ - "$vulkan_gen_dir/vk_validation_error_messages_h_is_removed", - ] + deps = [ ":python_gen_deps" ] + outputs = [ "$vulkan_gen_dir/vk_validation_error_messages_h_is_removed" ] args = [ "$raw_vulkan_gen_dir/vk_validation_error_messages_h_is_removed", "$raw_vulkan_gen_dir/vk_validation_error_messages.h", @@ -169,12 +163,8 @@ action("vulkan_clean_old_validation_layer_objects") { script = "$angle_root/scripts/remove_files.py" # inputs is a (random) new file since the vvl roll, used to ensure the cleanup is done only once - inputs = [ - "src/layers/gpu_validation.cpp", - ] - outputs = [ - "$vulkan_gen_dir/old_vvl_files_are_removed", - ] + inputs = [ "src/layers/gpu_validation.cpp" ] + outputs = [ "$vulkan_gen_dir/old_vvl_files_are_removed" ] args = [ "$raw_vulkan_gen_dir/old_vvl_files_are_removed", "$raw_root_out_dir/libVkLayer*", @@ -199,9 +189,7 @@ foreach(script_and_dep, helper_script_and_deps) { "$vulkan_gen_dir/common_codegen.py", "src/layers/vk_validation_error_messages.h", ] - outputs = [ - "$vulkan_gen_dir/$file", - ] + outputs = [ "$vulkan_gen_dir/$file" ] args = [ "-o", raw_vulkan_gen_dir, @@ -230,12 +218,8 @@ if (spirv_use_commit_id) { # This could be generalized to a foreach if other revisions are added. action("spirv_tools_external_revision_generate") { script = "src/scripts/external_revision_generator.py" - inputs = [ - "//DEPS", - ] - outputs = [ - "$vulkan_gen_dir/spirv_tools_commit_id.h", - ] + inputs = [ "//DEPS" ] + outputs = [ "$vulkan_gen_dir/spirv_tools_commit_id.h" ] args = [ "--git_dir", "$raw_spirv_tools_dir", @@ -247,12 +231,8 @@ if (spirv_use_commit_id) { } } else { copy("spirv_tools_external_revision_generate") { - sources = [ - "dummy_spirv_tools_commit_id.h", - ] - outputs = [ - "$vulkan_gen_dir/spirv_tools_commit_id.h", - ] + sources = [ "dummy_spirv_tools_commit_id.h" ] + outputs = [ "$vulkan_gen_dir/spirv_tools_commit_id.h" ] } } @@ -302,9 +282,9 @@ core_validation_sources = [ "$vulkan_gen_dir/vk_safe_struct.h", "src/layers/buffer_validation.cpp", "src/layers/buffer_validation.h", + "src/layers/convert_to_renderpass2.cpp", "src/layers/core_validation.cpp", "src/layers/core_validation.h", - "src/layers/convert_to_renderpass2.cpp", "src/layers/descriptor_sets.cpp", "src/layers/descriptor_sets.h", "src/layers/gpu_validation.cpp", @@ -359,9 +339,9 @@ unique_objects_deps = [] chassis_deps = [ ":vulkan_gen_layer_chassis_cpp", - ":vulkan_gen_layer_chassis_h", ":vulkan_gen_layer_chassis_dispatch_cpp", ":vulkan_gen_layer_chassis_dispatch_h", + ":vulkan_gen_layer_chassis_h", ] layers = [ @@ -402,9 +382,7 @@ if (!is_android) { action("vulkan_gen_json_files") { script = "$angle_root/scripts/generate_vulkan_layers_json.py" - public_deps = [ - ":vulkan_clean_old_validation_layer_objects", - ] + public_deps = [ ":vulkan_clean_old_validation_layer_objects" ] json_names = [ "VkLayer_core_validation.json", "VkLayer_object_lifetimes.json", @@ -413,9 +391,7 @@ if (!is_android) { "VkLayer_thread_safety.json", "VkLayer_unique_objects.json", ] - sources = [ - "../vulkan-headers/src/include/vulkan/vulkan_core.h", - ] + sources = [ "../vulkan-headers/src/include/vulkan/vulkan_core.h" ] outputs = [] foreach(json_name, json_names) { sources += [ "src/layers/json/$json_name.in" ] @@ -448,9 +424,7 @@ source_set("vulkan_layer_utils") { ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - public_deps = [ - ":vulkan_generate_helper_files", - ] + public_deps = [ ":vulkan_generate_helper_files" ] configs -= vulkan_undefine_configs } @@ -488,9 +462,7 @@ foreach(layer_info, layers) { configs += [ "//build/config/compiler:no_chromium_code" ] configs -= vulkan_undefine_configs public_configs = [ ":vulkan_layer_config" ] - deps = [ - ":vulkan_layer_utils", - ] + deps = [ ":vulkan_layer_utils" ] if (layer_info[2] != "") { deps += layer_info[2] } diff --git a/skia/third_party/externals/angle2/util/util.gni b/skia/third_party/externals/angle2/util/util.gni index 91039480b7c7a109a6a8d9bfa8510358fa485946..52134228f985530faf680334c59b2389d9b98485 100644 --- a/skia/third_party/externals/angle2/util/util.gni +++ b/skia/third_party/externals/angle2/util/util.gni @@ -3,10 +3,19 @@ # found in the LICENSE file. util_sources = [ + "util/EGLWindow.cpp", + "util/EGLWindow.h", + "util/Event.h", + "util/Matrix.cpp", + "util/Matrix.h", + "util/OSPixmap.h", + "util/OSWindow.cpp", + "util/OSWindow.h", + "util/Timer.h", "util/com_utils.h", - "util/keyboard.h", "util/geometry_utils.cpp", "util/geometry_utils.h", + "util/keyboard.h", "util/mouse.h", "util/random_utils.cpp", "util/random_utils.h", @@ -15,27 +24,18 @@ util_sources = [ "util/system_utils.h", "util/util_export.h", "util/util_gl.h", - "util/Event.h", - "util/EGLWindow.cpp", - "util/EGLWindow.h", - "util/Matrix.cpp", - "util/Matrix.h", - "util/OSPixmap.h", - "util/OSWindow.cpp", - "util/OSWindow.h", - "util/Timer.h", ] util_win_sources = [ - "util/windows/win32/Win32_system_utils.cpp", + "util/windows/WGLWindow.h", + "util/windows/WindowsTimer.cpp", + "util/windows/WindowsTimer.h", + "util/windows/Windows_system_utils.cpp", "util/windows/win32/Win32Pixmap.cpp", "util/windows/win32/Win32Pixmap.h", "util/windows/win32/Win32Window.cpp", "util/windows/win32/Win32Window.h", - "util/windows/Windows_system_utils.cpp", - "util/windows/WindowsTimer.cpp", - "util/windows/WindowsTimer.h", - "util/windows/WGLWindow.h", + "util/windows/win32/Win32_system_utils.cpp", ] util_win_shared_sources = [ "util/windows/WGLWindow.cpp" ] @@ -68,12 +68,12 @@ util_ozone_sources = [ ] util_osx_sources = [ + "util/osx/OSXPixmap.h", + "util/osx/OSXPixmap.mm", "util/osx/OSXTimer.cpp", "util/osx/OSXTimer.h", - "util/osx/OSXPixmap.mm", - "util/osx/OSXPixmap.h", - "util/osx/OSXWindow.mm", "util/osx/OSXWindow.h", + "util/osx/OSXWindow.mm", "util/posix/Posix_crash_handler.cpp", "util/posix/Posix_system_utils.cpp", ] diff --git a/skia/third_party/externals/dawn/BUILD.gn b/skia/third_party/externals/dawn/BUILD.gn index ead3c39b526822c878d77cd879d5bf65502ac34b..28ade2f497374fa1862cc23ee98b35cf52d12901 100644 --- a/skia/third_party/externals/dawn/BUILD.gn +++ b/skia/third_party/externals/dawn/BUILD.gn @@ -62,9 +62,7 @@ if (dawn_enable_opengl) { # Public libdawn_native headers so they can be publically visible for # dependencies of libdawn_native source_set("libdawn_native_headers") { - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] sources = [ "src/include/dawn_native/DawnNative.h", @@ -386,17 +384,13 @@ dawn_component("libdawn_native") { DEFINE_PREFIX = "DAWN_NATIVE" #Make headers publically visible - public_deps = [ - ":libdawn_native_headers", - ] + public_deps = [ ":libdawn_native_headers" ] deps = [ ":libdawn_native_sources", "${dawn_root}/src/common", ] - sources = [ - "src/dawn_native/DawnNative.cpp", - ] + sources = [ "src/dawn_native/DawnNative.cpp" ] configs = [ ":libdawn_native_internal" ] if (dawn_enable_d3d12) { @@ -478,9 +472,7 @@ dawn_component("libdawn_wire") { ] # Make headers publically visible - public_deps = [ - "${dawn_root}/src/dawn_wire:libdawn_wire_headers", - ] + public_deps = [ "${dawn_root}/src/dawn_wire:libdawn_wire_headers" ] } ############################################################################### @@ -503,9 +495,7 @@ static_library("dawn_utils") { "src/utils/TerribleCommandBuffer.h", ] - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] deps = [ ":libdawn_native", @@ -719,16 +709,12 @@ test("dawn_end2end_tests") { # Temporary groups to make a 5-way patch to fix crbug.com/913171 group("dawn_unittests_temp_group") { testonly = true - deps = [ - ":dawn_unittests", - ] + deps = [ ":dawn_unittests" ] } group("dawn_end2end_tests_temp_group") { testonly = true - deps = [ - ":dawn_end2end_tests", - ] + deps = [ ":dawn_end2end_tests" ] } ############################################################################### @@ -758,9 +744,7 @@ if (dawn_standalone) { # Template for samples to avoid listing dawn_sample_utils as a dep every time template("dawn_sample") { executable(target_name) { - deps = [ - ":dawn_sample_utils", - ] + deps = [ ":dawn_sample_utils" ] forward_variables_from(invoker, "*", [ "deps" ]) if (defined(invoker.deps)) { @@ -770,39 +754,25 @@ if (dawn_standalone) { } dawn_sample("CppHelloTriangle") { - sources = [ - "examples/CppHelloTriangle.cpp", - ] + sources = [ "examples/CppHelloTriangle.cpp" ] } dawn_sample("CHelloTriangle") { - sources = [ - "examples/CHelloTriangle.cpp", - ] + sources = [ "examples/CHelloTriangle.cpp" ] } dawn_sample("ComputeBoids") { - sources = [ - "examples/ComputeBoids.cpp", - ] - deps = [ - "third_party:glm", - ] + sources = [ "examples/ComputeBoids.cpp" ] + deps = [ "third_party:glm" ] } dawn_sample("Animometer") { - sources = [ - "examples/Animometer.cpp", - ] + sources = [ "examples/Animometer.cpp" ] } dawn_sample("CubeReflection") { - sources = [ - "examples/CubeReflection.cpp", - ] - deps = [ - "third_party:glm", - ] + sources = [ "examples/CubeReflection.cpp" ] + deps = [ "third_party:glm" ] } group("dawn_samples") { diff --git a/skia/third_party/externals/dawn/generator/generator_lib.gni b/skia/third_party/externals/dawn/generator/generator_lib.gni index d3698f2d4c89d83001e88057509964eb33e51ce4..0e9122d9c6294ffd4dfea01308f22ef0579fb105 100644 --- a/skia/third_party/externals/dawn/generator/generator_lib.gni +++ b/skia/third_party/externals/dawn/generator/generator_lib.gni @@ -115,9 +115,7 @@ template("generator_lib_action") { # outputs are what's expected and write a depfile for Ninja. action(_json_tarball_target) { script = invoker.script - outputs = [ - _json_tarball, - ] + outputs = [ _json_tarball ] depfile = _json_tarball_depfile args = _generator_args } @@ -130,12 +128,8 @@ template("generator_lib_action") { rebase_path(_gen_dir, root_build_dir), ] - deps = [ - ":${_json_tarball_target}", - ] - inputs = [ - _json_tarball, - ] + deps = [ ":${_json_tarball_target}" ] + inputs = [ _json_tarball ] # The expected output list is relative to the gen_dir but action # target outputs are from the root dir so we need to rebase them. diff --git a/skia/third_party/externals/dawn/scripts/dawn_component.gni b/skia/third_party/externals/dawn/scripts/dawn_component.gni index d2af95a6f52dd65fc820621eebb9481cfa21b6c6..b822f5d48f1f821c9c7d14053748d7a07f9f744c 100644 --- a/skia/third_party/externals/dawn/scripts/dawn_component.gni +++ b/skia/third_party/externals/dawn/scripts/dawn_component.gni @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("dawn_overrides_with_defaults.gni") import("dawn_features.gni") +import("dawn_overrides_with_defaults.gni") ############################################################################### # Template to produce a component for one of Dawn's libraries. @@ -125,13 +125,9 @@ template("dawn_component") { group(libname) { if (is_component_build) { - public_deps = [ - ":${libname}_shared", - ] + public_deps = [ ":${libname}_shared" ] } else { - public_deps = [ - ":${libname}_static", - ] + public_deps = [ ":${libname}_static" ] } } } diff --git a/skia/third_party/externals/dawn/src/common/BUILD.gn b/skia/third_party/externals/dawn/src/common/BUILD.gn index 0d05c275b3d9463f47d9e771e91d1c71e3384834..8ec5d1f4a08fef73e28c306a393e9cdb3ee254cf 100644 --- a/skia/third_party/externals/dawn/src/common/BUILD.gn +++ b/skia/third_party/externals/dawn/src/common/BUILD.gn @@ -98,13 +98,9 @@ if (is_win || is_linux || is_mac) { ] public_configs = [ ":dawn_internal" ] - deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + deps = [ "${dawn_root}/src/dawn:dawn_headers" ] if (dawn_enable_vulkan) { - public_deps = [ - "../../third_party:vulkan_headers", - ] + public_deps = [ "../../third_party:vulkan_headers" ] } } } diff --git a/skia/third_party/externals/dawn/src/dawn/BUILD.gn b/skia/third_party/externals/dawn/src/dawn/BUILD.gn index 7e2efade3ec874ba5ddf2babcf430c5c32eaf183..674d8c360c3b312db244b34cd5743c6181cd385b 100644 --- a/skia/third_party/externals/dawn/src/dawn/BUILD.gn +++ b/skia/third_party/externals/dawn/src/dawn/BUILD.gn @@ -14,8 +14,8 @@ import("../../scripts/dawn_overrides_with_defaults.gni") -import("${dawn_root}/scripts/dawn_component.gni") import("${dawn_root}/generator/dawn_generator.gni") +import("${dawn_root}/scripts/dawn_component.gni") ############################################################################### # Dawn headers @@ -35,9 +35,7 @@ dawn_json_generator("dawn_headers_gen") { source_set("dawn_headers") { all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] - deps = [ - ":dawn_headers_gen", - ] + deps = [ ":dawn_headers_gen" ] sources = get_target_outputs(":dawn_headers_gen") sources += [ @@ -62,12 +60,8 @@ dawn_json_generator("libdawn_gen") { dawn_component("libdawn") { DEFINE_PREFIX = "DAWN" - public_deps = [ - ":dawn_headers", - ] + public_deps = [ ":dawn_headers" ] - deps = [ - ":libdawn_gen", - ] + deps = [ ":libdawn_gen" ] sources = get_target_outputs(":libdawn_gen") } diff --git a/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn b/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn index c6a6618be1bdfeae8d27a0d2187ed6bf05b353eb..4f73e1fa89c48dc41909a618a5925e1f16f0fc3a 100644 --- a/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn +++ b/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn @@ -14,8 +14,8 @@ import("../../scripts/dawn_overrides_with_defaults.gni") -import("${dawn_root}/scripts/dawn_component.gni") import("${dawn_root}/generator/dawn_generator.gni") +import("${dawn_root}/scripts/dawn_component.gni") ############################################################################### # libdawn_wire @@ -24,9 +24,7 @@ import("${dawn_root}/generator/dawn_generator.gni") # Public libdawn_wire headers so they can be publically visible for # dependencies of libdawn_wire source_set("libdawn_wire_headers") { - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] sources = [ "${dawn_root}/src/include/dawn_wire/Wire.h", diff --git a/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn b/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn index 2369f94d1cfa2223c54d1c8f28c759a12c7278f0..59ec78037989b77fcacb74fd49a35da9e2fdd032 100644 --- a/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn +++ b/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("../../scripts/dawn_overrides_with_defaults.gni") import("//build_overrides/build.gni") +import("../../scripts/dawn_overrides_with_defaults.gni") # We only have libfuzzer in Chromium builds but if we build fuzzer targets only # there, we would risk breaking fuzzer targets all the time when making changes @@ -74,21 +74,15 @@ static_library("dawn_spirv_cross_fuzzer_common") { "DawnSPIRVCrossFuzzer.cpp", "DawnSPIRVCrossFuzzer.h", ] - public_deps = [ - "${dawn_shaderc_dir}:libshaderc_spvc", - ] + public_deps = [ "${dawn_shaderc_dir}:libshaderc_spvc" ] } # TODO(rharrison): Remove asan_options once signal trap is no longer # needed. # Uses Dawn specific options and varies input data dawn_fuzzer_test("dawn_spirv_cross_glsl_fast_fuzzer") { - sources = [ - "DawnSPIRVCrossGLSLFastFuzzer.cpp", - ] - deps = [ - ":dawn_spirv_cross_fuzzer_common", - ] + sources = [ "DawnSPIRVCrossGLSLFastFuzzer.cpp" ] + deps = [ ":dawn_spirv_cross_fuzzer_common" ] asan_options = [ "allow_user_segv_handler=1" ] } @@ -96,12 +90,8 @@ dawn_fuzzer_test("dawn_spirv_cross_glsl_fast_fuzzer") { # needed. # Uses Dawn specific options and varies input data dawn_fuzzer_test("dawn_spirv_cross_hlsl_fast_fuzzer") { - sources = [ - "DawnSPIRVCrossHLSLFastFuzzer.cpp", - ] - deps = [ - ":dawn_spirv_cross_fuzzer_common", - ] + sources = [ "DawnSPIRVCrossHLSLFastFuzzer.cpp" ] + deps = [ ":dawn_spirv_cross_fuzzer_common" ] asan_options = [ "allow_user_segv_handler=1" ] } @@ -109,19 +99,13 @@ dawn_fuzzer_test("dawn_spirv_cross_hlsl_fast_fuzzer") { # needed. # Uses Dawn specific options and varies input data dawn_fuzzer_test("dawn_spirv_cross_msl_fast_fuzzer") { - sources = [ - "DawnSPIRVCrossMSLFastFuzzer.cpp", - ] - deps = [ - ":dawn_spirv_cross_fuzzer_common", - ] + sources = [ "DawnSPIRVCrossMSLFastFuzzer.cpp" ] + deps = [ ":dawn_spirv_cross_fuzzer_common" ] asan_options = [ "allow_user_segv_handler=1" ] } dawn_fuzzer_test("dawn_wire_server_and_frontend_fuzzer") { - sources = [ - "DawnWireServerAndFrontendFuzzer.cpp", - ] + sources = [ "DawnWireServerAndFrontendFuzzer.cpp" ] deps = [ "${dawn_root}/:libdawn_native_static", diff --git a/skia/third_party/externals/dawn/third_party/BUILD.gn b/skia/third_party/externals/dawn/third_party/BUILD.gn index 01a28a6f2a47cf370eb1cf75d46e74e33281c177..534529e115144802f2669abc0e38bfe617b0625c 100644 --- a/skia/third_party/externals/dawn/third_party/BUILD.gn +++ b/skia/third_party/externals/dawn/third_party/BUILD.gn @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("../scripts/dawn_overrides_with_defaults.gni") -import("../scripts/dawn_features.gni") import("//build_overrides/build.gni") +import("../scripts/dawn_features.gni") +import("../scripts/dawn_overrides_with_defaults.gni") is_msvc = is_win && !is_clang @@ -147,9 +147,7 @@ source_set("vulkan_headers") { } source_set("khronos_platform") { - sources = [ - "khronos/KHR/khrplatform.h", - ] + sources = [ "khronos/KHR/khrplatform.h" ] public_configs = [ ":khronos_headers_public" ] } @@ -177,9 +175,7 @@ if (!build_with_chromium) { static_library("gtest") { testonly = true - sources = [ - "${googletest_dir}/googletest/src/gtest-all.cc", - ] + sources = [ "${googletest_dir}/googletest/src/gtest-all.cc" ] public_configs = [ ":gtest_config" ] } @@ -193,9 +189,7 @@ if (!build_with_chromium) { static_library("gmock") { testonly = true - sources = [ - "${googletest_dir}/googlemock/src/gmock-all.cc", - ] + sources = [ "${googletest_dir}/googlemock/src/gmock-all.cc" ] public_configs = [ ":gmock_config" ] } diff --git a/skia/third_party/externals/icu/BUILD.gn b/skia/third_party/externals/icu/BUILD.gn index ac47ef21172cb811d0e8e6a5deeddc965cd32304..28328b30310b464184d59047c35e61d17c5948b6 100644 --- a/skia/third_party/externals/icu/BUILD.gn +++ b/skia/third_party/externals/icu/BUILD.gn @@ -5,9 +5,6 @@ import("//build/config/host_byteorder.gni") import("//third_party/icu/config.gni") -if (is_android) { -} - if (is_mac) { import("//build/config/sanitizers/sanitizers.gni") } @@ -82,22 +79,22 @@ config("icu_code") { "/wd4005", # Macro redefinition. "/wd4068", # Unknown pragmas. "/wd4267", # Conversion from size_t on 64-bits. - "/utf-8", # ICU source files are in UTF-8. + "/utf-8", # ICU source files are in UTF-8. ] } else if (is_linux || is_android) { - cflags += [ - "-Wno-unused-function", - ] + cflags += [ "-Wno-unused-function" ] } if (is_clang) { cflags += [ # ICU has some code with the pattern: # if (found = uprv_getWindowsTimeZoneInfo(...)) "-Wno-parentheses", + # ucnv2022.cpp contains three functions that are only used when # certain preprocessor defines are set. # unistr.cpp also has an unused function for non-component builds. "-Wno-unused-function", + # putil.cpp contains unused variables when building for iOS simulators. "-Wno-unused-variable", ] @@ -136,34 +133,35 @@ component("icui18n") { "source/i18n/chnsecal.h", "source/i18n/choicfmt.cpp", "source/i18n/coleitr.cpp", + "source/i18n/coll.cpp", + "source/i18n/collation.cpp", + "source/i18n/collation.h", "source/i18n/collationbuilder.cpp", "source/i18n/collationbuilder.h", "source/i18n/collationcompare.cpp", "source/i18n/collationcompare.h", - "source/i18n/collation.cpp", - "source/i18n/collationdatabuilder.cpp", - "source/i18n/collationdatabuilder.h", "source/i18n/collationdata.cpp", "source/i18n/collationdata.h", + "source/i18n/collationdatabuilder.cpp", + "source/i18n/collationdatabuilder.h", "source/i18n/collationdatareader.cpp", "source/i18n/collationdatareader.h", "source/i18n/collationdatawriter.cpp", "source/i18n/collationdatawriter.h", - "source/i18n/collationfastlatinbuilder.cpp", - "source/i18n/collationfastlatinbuilder.h", "source/i18n/collationfastlatin.cpp", "source/i18n/collationfastlatin.h", + "source/i18n/collationfastlatinbuilder.cpp", + "source/i18n/collationfastlatinbuilder.h", "source/i18n/collationfcd.cpp", "source/i18n/collationfcd.h", - "source/i18n/collation.h", "source/i18n/collationiterator.cpp", "source/i18n/collationiterator.h", "source/i18n/collationkeys.cpp", "source/i18n/collationkeys.h", "source/i18n/collationroot.cpp", + "source/i18n/collationroot.h", "source/i18n/collationrootelements.cpp", "source/i18n/collationrootelements.h", - "source/i18n/collationroot.h", "source/i18n/collationruleparser.cpp", "source/i18n/collationruleparser.h", "source/i18n/collationsets.cpp", @@ -174,7 +172,6 @@ component("icui18n") { "source/i18n/collationtailoring.h", "source/i18n/collationweights.cpp", "source/i18n/collationweights.h", - "source/i18n/coll.cpp", "source/i18n/collunsafe.h", "source/i18n/compactdecimalformat.cpp", "source/i18n/coptccal.cpp", @@ -210,30 +207,30 @@ component("icui18n") { "source/i18n/dcfmtsym.cpp", "source/i18n/decContext.cpp", "source/i18n/decContext.h", - "source/i18n/decimfmt.cpp", "source/i18n/decNumber.cpp", "source/i18n/decNumber.h", "source/i18n/decNumberLocal.h", - "source/i18n/double-conversion-bignum.cpp", + "source/i18n/decimfmt.cpp", "source/i18n/double-conversion-bignum-dtoa.cpp", "source/i18n/double-conversion-bignum-dtoa.h", + "source/i18n/double-conversion-bignum.cpp", "source/i18n/double-conversion-bignum.h", "source/i18n/double-conversion-cached-powers.cpp", "source/i18n/double-conversion-cached-powers.h", - "source/i18n/double-conversion.cpp", "source/i18n/double-conversion-diy-fp.cpp", "source/i18n/double-conversion-diy-fp.h", "source/i18n/double-conversion-fast-dtoa.cpp", "source/i18n/double-conversion-fast-dtoa.h", - "source/i18n/double-conversion.h", "source/i18n/double-conversion-ieee.h", "source/i18n/double-conversion-strtod.cpp", "source/i18n/double-conversion-strtod.h", "source/i18n/double-conversion-utils.h", - "source/i18n/dtfmtsym.cpp", + "source/i18n/double-conversion.cpp", + "source/i18n/double-conversion.h", "source/i18n/dt_impl.h", - "source/i18n/dtitvfmt.cpp", + "source/i18n/dtfmtsym.cpp", "source/i18n/dtitv_impl.h", + "source/i18n/dtitvfmt.cpp", "source/i18n/dtitvinf.cpp", "source/i18n/dtptngen.cpp", "source/i18n/dtptngen_impl.h", @@ -244,8 +241,8 @@ component("icui18n") { "source/i18n/esctrn.h", "source/i18n/ethpccal.cpp", "source/i18n/ethpccal.h", - "source/i18n/fmtable_cnv.cpp", "source/i18n/fmtable.cpp", + "source/i18n/fmtable_cnv.cpp", "source/i18n/fmtableimp.h", "source/i18n/format.cpp", "source/i18n/fphdlimp.cpp", @@ -373,9 +370,9 @@ component("icui18n") { "source/i18n/quantityformatter.h", "source/i18n/rbnf.cpp", "source/i18n/rbt.cpp", + "source/i18n/rbt.h", "source/i18n/rbt_data.cpp", "source/i18n/rbt_data.h", - "source/i18n/rbt.h", "source/i18n/rbt_pars.cpp", "source/i18n/rbt_pars.h", "source/i18n/rbt_rule.cpp", @@ -455,10 +452,10 @@ component("icui18n") { "source/i18n/ucln_in.cpp", "source/i18n/ucln_in.h", "source/i18n/ucol.cpp", - "source/i18n/ucoleitr.cpp", "source/i18n/ucol_imp.h", "source/i18n/ucol_res.cpp", "source/i18n/ucol_sit.cpp", + "source/i18n/ucoleitr.cpp", "source/i18n/ucsdet.cpp", "source/i18n/udat.cpp", "source/i18n/udateintervalformat.cpp", @@ -477,14 +474,14 @@ component("icui18n") { "source/i18n/unum.cpp", "source/i18n/unumsys.cpp", "source/i18n/upluralrules.cpp", - "source/i18n/uregexc.cpp", "source/i18n/uregex.cpp", + "source/i18n/uregexc.cpp", "source/i18n/uregion.cpp", "source/i18n/usearch.cpp", + "source/i18n/uspoof.cpp", "source/i18n/uspoof_build.cpp", "source/i18n/uspoof_conf.cpp", "source/i18n/uspoof_conf.h", - "source/i18n/uspoof.cpp", "source/i18n/uspoof_impl.cpp", "source/i18n/uspoof_impl.h", "source/i18n/usrchimp.h", @@ -509,12 +506,15 @@ component("icui18n") { "source/i18n/zrule.h", "source/i18n/ztrans.cpp", "source/i18n/ztrans.h", + # I18N_SRC_END ] + # ls source/i18n/unicode/*h | sort | sed 's/^\(.*\)$/ "\1",/' public = [ # crbug.com/726654: Make astro.h public until the upstream adds an API. "source/i18n/astro.h", + # I18N_HDR_START "source/i18n/unicode/alphaindex.h", "source/i18n/unicode/basictz.h", @@ -575,11 +575,11 @@ component("icui18n") { "source/i18n/unicode/tzrule.h", "source/i18n/unicode/tztrans.h", "source/i18n/unicode/ucal.h", - "source/i18n/unicode/ucoleitr.h", "source/i18n/unicode/ucol.h", + "source/i18n/unicode/ucoleitr.h", "source/i18n/unicode/ucsdet.h", - "source/i18n/unicode/udateintervalformat.h", "source/i18n/unicode/udat.h", + "source/i18n/unicode/udateintervalformat.h", "source/i18n/unicode/udatpg.h", "source/i18n/unicode/ufieldpositer.h", "source/i18n/unicode/uformattable.h", @@ -588,8 +588,8 @@ component("icui18n") { "source/i18n/unicode/ulocdata.h", "source/i18n/unicode/umsg.h", "source/i18n/unicode/unirepl.h", - "source/i18n/unicode/unumberformatter.h", "source/i18n/unicode/unum.h", + "source/i18n/unicode/unumberformatter.h", "source/i18n/unicode/unumsys.h", "source/i18n/unicode/upluralrules.h", "source/i18n/unicode/uregex.h", @@ -600,13 +600,12 @@ component("icui18n") { "source/i18n/unicode/utmscale.h", "source/i18n/unicode/utrans.h", "source/i18n/unicode/vtzone.h", + # I18N_HDR_END ] defines = [ "U_I18N_IMPLEMENTATION" ] - deps = [ - ":icuuc", - ] + deps = [ ":icuuc" ] # ICU uses RTTI, replace the default "no rtti" config. configs -= [ @@ -642,8 +641,8 @@ component("icuuc") { "source/common/bytesinkutil.cpp", "source/common/bytesinkutil.h", "source/common/bytestream.cpp", - "source/common/bytestriebuilder.cpp", "source/common/bytestrie.cpp", + "source/common/bytestriebuilder.cpp", "source/common/bytestrieiterator.cpp", "source/common/caniter.cpp", "source/common/characterproperties.cpp", @@ -690,8 +689,8 @@ component("icuuc") { "source/common/messagepattern.cpp", "source/common/msvcres.h", "source/common/mutex.h", - "source/common/norm2allmodes.h", "source/common/norm2_nfc_data.h", + "source/common/norm2allmodes.h", "source/common/normalizer2.cpp", "source/common/normalizer2impl.cpp", "source/common/normalizer2impl.h", @@ -702,17 +701,17 @@ component("icuuc") { "source/common/pluralmap.cpp", "source/common/pluralmap.h", "source/common/propname.cpp", - "source/common/propname_data.h", "source/common/propname.h", + "source/common/propname_data.h", "source/common/propsvec.cpp", "source/common/propsvec.h", "source/common/punycode.cpp", "source/common/punycode.h", "source/common/putil.cpp", "source/common/putilimp.h", + "source/common/rbbi.cpp", "source/common/rbbi_cache.cpp", "source/common/rbbi_cache.h", - "source/common/rbbi.cpp", "source/common/rbbidata.cpp", "source/common/rbbidata.h", "source/common/rbbinode.cpp", @@ -727,8 +726,8 @@ component("icuuc") { "source/common/rbbistbl.cpp", "source/common/rbbitblb.cpp", "source/common/rbbitblb.h", - "source/common/resbund_cnv.cpp", "source/common/resbund.cpp", + "source/common/resbund_cnv.cpp", "source/common/resource.cpp", "source/common/resource.h", "source/common/ruleiter.cpp", @@ -756,63 +755,63 @@ component("icuuc") { "source/common/uarrsort.h", "source/common/uassert.h", "source/common/ubidi.cpp", - "source/common/ubidiimp.h", - "source/common/ubidiln.cpp", "source/common/ubidi_props.cpp", - "source/common/ubidi_props_data.h", "source/common/ubidi_props.h", + "source/common/ubidi_props_data.h", + "source/common/ubidiimp.h", + "source/common/ubidiln.cpp", "source/common/ubiditransform.cpp", "source/common/ubidiwrt.cpp", "source/common/ubrk.cpp", "source/common/ubrkimpl.h", "source/common/ucase.cpp", "source/common/ucase.h", + "source/common/ucase_props_data.h", "source/common/ucasemap.cpp", "source/common/ucasemap_imp.h", "source/common/ucasemap_titlecase_brkiter.cpp", - "source/common/ucase_props_data.h", "source/common/ucat.cpp", "source/common/uchar.cpp", "source/common/uchar_props_data.h", - "source/common/ucharstriebuilder.cpp", "source/common/ucharstrie.cpp", + "source/common/ucharstriebuilder.cpp", "source/common/ucharstrieiterator.cpp", "source/common/uchriter.cpp", + "source/common/ucln.h", "source/common/ucln_cmn.cpp", "source/common/ucln_cmn.h", - "source/common/ucln.h", "source/common/ucln_imp.h", "source/common/ucmndata.cpp", "source/common/ucmndata.h", + "source/common/ucnv.cpp", "source/common/ucnv2022.cpp", "source/common/ucnv_bld.cpp", "source/common/ucnv_bld.h", - "source/common/ucnvbocu.cpp", "source/common/ucnv_cb.cpp", "source/common/ucnv_cnv.cpp", "source/common/ucnv_cnv.h", - "source/common/ucnv.cpp", "source/common/ucnv_ct.cpp", - "source/common/ucnvdisp.cpp", "source/common/ucnv_err.cpp", "source/common/ucnv_ext.cpp", "source/common/ucnv_ext.h", - "source/common/ucnvhz.cpp", "source/common/ucnv_imp.h", "source/common/ucnv_io.cpp", "source/common/ucnv_io.h", - "source/common/ucnvisci.cpp", - "source/common/ucnvlat1.cpp", "source/common/ucnv_lmb.cpp", - "source/common/ucnvmbcs.cpp", - "source/common/ucnvmbcs.h", - "source/common/ucnvscsu.cpp", - "source/common/ucnvsel.cpp", "source/common/ucnv_set.cpp", "source/common/ucnv_u16.cpp", "source/common/ucnv_u32.cpp", "source/common/ucnv_u7.cpp", "source/common/ucnv_u8.cpp", + "source/common/ucnvbocu.cpp", + "source/common/ucnvdisp.cpp", + "source/common/ucnvhz.cpp", + "source/common/ucnvisci.cpp", + "source/common/ucnvlat1.cpp", + "source/common/ucnvmbcs.cpp", + "source/common/ucnvmbcs.h", + "source/common/ucnvscsu.cpp", + "source/common/ucnvsel.cpp", "source/common/ucol_data.h", "source/common/ucol_swp.cpp", "source/common/ucol_swp.h", @@ -840,9 +839,9 @@ component("icuuc") { "source/common/ulist.cpp", "source/common/ulist.h", "source/common/uloc.cpp", - "source/common/ulocimp.h", "source/common/uloc_keytype.cpp", "source/common/uloc_tag.cpp", + "source/common/ulocimp.h", "source/common/umapfile.cpp", "source/common/umapfile.h", "source/common/umath.cpp", @@ -854,27 +853,27 @@ component("icuuc") { "source/common/unifiedcache.h", "source/common/unifilt.cpp", "source/common/unifunct.cpp", - "source/common/uniset_closure.cpp", "source/common/uniset.cpp", + "source/common/uniset_closure.cpp", "source/common/uniset_props.cpp", "source/common/unisetspan.cpp", "source/common/unisetspan.h", - "source/common/unistrappender.h", + "source/common/unistr.cpp", "source/common/unistr_case.cpp", "source/common/unistr_case_locale.cpp", "source/common/unistr_cnv.cpp", - "source/common/unistr.cpp", "source/common/unistr_props.cpp", "source/common/unistr_titlecase_brkiter.cpp", - "source/common/unormcmp.cpp", + "source/common/unistrappender.h", "source/common/unorm.cpp", + "source/common/unormcmp.cpp", "source/common/unormimp.h", "source/common/uobject.cpp", "source/common/uposixdefs.h", "source/common/uprops.cpp", "source/common/uprops.h", - "source/common/uresbund.cpp", "source/common/ures_cnv.cpp", + "source/common/uresbund.cpp", "source/common/uresdata.cpp", "source/common/uresdata.h", "source/common/uresimp.h", @@ -885,24 +884,24 @@ component("icuuc") { "source/common/uscript_props.cpp", "source/common/uset.cpp", "source/common/uset_imp.h", - "source/common/usetiter.cpp", "source/common/uset_props.cpp", + "source/common/usetiter.cpp", "source/common/ushape.cpp", "source/common/usprep.cpp", "source/common/ustack.cpp", - "source/common/ustrcase.cpp", - "source/common/ustrcase_locale.cpp", "source/common/ustr_cnv.cpp", "source/common/ustr_cnv.h", + "source/common/ustr_imp.h", + "source/common/ustr_titlecase_brkiter.cpp", + "source/common/ustr_wcs.cpp", + "source/common/ustrcase.cpp", + "source/common/ustrcase_locale.cpp", "source/common/ustrenum.cpp", "source/common/ustrenum.h", "source/common/ustrfmt.cpp", "source/common/ustrfmt.h", - "source/common/ustr_imp.h", "source/common/ustring.cpp", - "source/common/ustr_titlecase_brkiter.cpp", "source/common/ustrtrns.cpp", - "source/common/ustr_wcs.cpp", "source/common/utext.cpp", "source/common/utf_impl.cpp", "source/common/util.cpp", @@ -910,12 +909,12 @@ component("icuuc") { "source/common/util_props.cpp", "source/common/utrace.cpp", "source/common/utracimp.h", - "source/common/utrie2_builder.cpp", + "source/common/utrie.cpp", + "source/common/utrie.h", "source/common/utrie2.cpp", "source/common/utrie2.h", + "source/common/utrie2_builder.cpp", "source/common/utrie2_impl.h", - "source/common/utrie.cpp", - "source/common/utrie.h", "source/common/utrie_swap.cpp", "source/common/uts46.cpp", "source/common/utypeinfo.h", @@ -928,6 +927,7 @@ component("icuuc") { "source/common/uvectr64.h", "source/common/wintz.cpp", "source/common/wintz.h", + # COMMON_SRC_END ] @@ -937,8 +937,8 @@ component("icuuc") { "source/common/unicode/appendable.h", "source/common/unicode/brkiter.h", "source/common/unicode/bytestream.h", - "source/common/unicode/bytestriebuilder.h", "source/common/unicode/bytestrie.h", + "source/common/unicode/bytestriebuilder.h", "source/common/unicode/caniter.h", "source/common/unicode/casemap.h", "source/common/unicode/char16ptr.h", @@ -981,13 +981,13 @@ component("icuuc") { "source/common/unicode/ucasemap.h", "source/common/unicode/ucat.h", "source/common/unicode/uchar.h", - "source/common/unicode/ucharstriebuilder.h", "source/common/unicode/ucharstrie.h", + "source/common/unicode/ucharstriebuilder.h", "source/common/unicode/uchriter.h", "source/common/unicode/uclean.h", + "source/common/unicode/ucnv.h", "source/common/unicode/ucnv_cb.h", "source/common/unicode/ucnv_err.h", - "source/common/unicode/ucnv.h", "source/common/unicode/ucnvsel.h", "source/common/unicode/uconfig.h", "source/common/unicode/ucpmap.h", @@ -1008,8 +1008,8 @@ component("icuuc") { "source/common/unicode/unimatch.h", "source/common/unicode/uniset.h", "source/common/unicode/unistr.h", - "source/common/unicode/unorm2.h", "source/common/unicode/unorm.h", + "source/common/unicode/unorm2.h", "source/common/unicode/uobject.h", "source/common/unicode/urename.h", "source/common/unicode/urep.h", @@ -1022,21 +1022,20 @@ component("icuuc") { "source/common/unicode/ustring.h", "source/common/unicode/ustringtrie.h", "source/common/unicode/utext.h", + "source/common/unicode/utf.h", "source/common/unicode/utf16.h", "source/common/unicode/utf32.h", "source/common/unicode/utf8.h", - "source/common/unicode/utf.h", "source/common/unicode/utf_old.h", "source/common/unicode/utrace.h", "source/common/unicode/utypes.h", "source/common/unicode/uvernum.h", "source/common/unicode/uversion.h", + # COMMON_HDR_END ] defines = [ "U_COMMON_IMPLEMENTATION" ] - deps = [ - ":icudata", - ] + deps = [ ":icudata" ] configs -= [ "//build/config/compiler:no_rtti", # ICU uses RTTI. @@ -1126,6 +1125,7 @@ if (icu_use_data_file) { rebase_path(inputs[0], root_build_dir), rebase_path(data_assembly, root_build_dir), ] + # TODO(GYP): Gyp has considerations here for QNX and for the host # toolchain that have not been ported over. if (is_mac || is_ios) { @@ -1136,7 +1136,7 @@ if (icu_use_data_file) { source_set("icudata") { sources = [ "$data_assembly" ] defines = [ "U_HIDE_DATA_SYMBOL" ] - deps = [ ":make_data_assembly", ] + deps = [ ":make_data_assembly" ] } } } diff --git a/skia/third_party/externals/icu/fuzzers/BUILD.gn b/skia/third_party/externals/icu/fuzzers/BUILD.gn index 3053d79548e8fe5530ac5d9509b617957f9b27b5..fa06968661d67c96927425335c7a222690e330aa 100644 --- a/skia/third_party/externals/icu/fuzzers/BUILD.gn +++ b/skia/third_party/externals/icu/fuzzers/BUILD.gn @@ -4,17 +4,15 @@ # ICU fuzzers. -import("//third_party/icu/config.gni") import("//testing/libfuzzer/fuzzer_test.gni") +import("//third_party/icu/config.gni") # root BUILD depenends on this target. Needed for package discovery group("fuzzers") { } source_set("fuzzer_support") { - public = [ - "fuzzer_utils.h", - ] + public = [ "fuzzer_utils.h" ] deps = [ "//base", "//base:i18n", @@ -24,72 +22,44 @@ source_set("fuzzer_support") { } fuzzer_test("icu_uregex_open_fuzzer") { - sources = [ - "icu_uregex_open_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_uregex_open_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] dict = "icu_regex.dict" libfuzzer_options = [ "max_len=128" ] } fuzzer_test("icu_unicode_string_codepage_create_fuzzer") { - sources = [ - "icu_unicode_string_codepage_create_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_unicode_string_codepage_create_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_number_format_fuzzer") { - sources = [ - "icu_number_format_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_number_format_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_break_iterator_fuzzer") { - sources = [ - "icu_break_iterator_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_break_iterator_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_break_iterator_utf32_fuzzer") { - sources = [ - "icu_break_iterator_utf32_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_break_iterator_utf32_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_ucasemap_fuzzer") { - sources = [ - "icu_ucasemap_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_ucasemap_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_converter_fuzzer") { - sources = [ - "icu_converter_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_converter_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } diff --git a/skia/third_party/externals/zlib/BUILD.gn b/skia/third_party/externals/zlib/BUILD.gn index 4764ec1c83c0787b944f4a9c4c9d0651a2af120c..8d8c11b4ef89f15201837f10c784ed82206e5079 100644 --- a/skia/third_party/externals/zlib/BUILD.gn +++ b/skia/third_party/externals/zlib/BUILD.gn @@ -87,9 +87,7 @@ if (use_arm_neon_optimizations) { if (is_android) { import("//build/config/android/config.gni") if (defined(android_ndk_root) && android_ndk_root != "") { - deps = [ - "//third_party/android_tools:cpu_features", - ] + deps = [ "//third_party/android_tools:cpu_features" ] } } @@ -194,9 +192,7 @@ static_library("zlib_x86_simd") { ] } } else { - sources = [ - "simd_stub.c", - ] + sources = [ "simd_stub.c" ] } configs -= [ "//build/config/compiler:chromium_code" ] @@ -313,9 +309,7 @@ static_library("minizip") { defines = [ "USE_FILE32API" ] } - deps = [ - ":zlib", - ] + deps = [ ":zlib" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ @@ -331,9 +325,7 @@ static_library("minizip") { executable("zlib_bench") { include_dirs = [ "." ] - sources = [ - "contrib/bench/zlib_bench.cc", - ] + sources = [ "contrib/bench/zlib_bench.cc" ] if (!is_debug) { configs -= [ "//build/config/compiler:default_optimization" ] @@ -343,7 +335,5 @@ executable("zlib_bench") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - deps = [ - ":zlib", - ] + deps = [ ":zlib" ] } diff --git a/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn b/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn index c46b66440073a5d93ea043fd5009a762925b4392..34c3b43d1f52af26c22830f9f32f8dd2152f4c75 100644 --- a/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn +++ b/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn @@ -9,37 +9,21 @@ group("fuzzers") { } fuzzer_test("zlib_uncompress_fuzzer") { - sources = [ - "uncompress_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "uncompress_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } fuzzer_test("zlib_inflate_fuzzer") { - sources = [ - "inflate_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "inflate_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } fuzzer_test("zlib_deflate_set_dictionary_fuzzer") { - sources = [ - "deflate_set_dictionary_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "deflate_set_dictionary_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } fuzzer_test("zlib_deflate_fuzzer") { - sources = [ - "deflate_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "deflate_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } diff --git a/skia/third_party/freetype2/BUILD.gn b/skia/third_party/freetype2/BUILD.gn index b76c2df34a50dce49fe38a2780d52aaf9b0f44d5..27145791e4a621034d6b4fe2cf34478c7878c73d 100644 --- a/skia/third_party/freetype2/BUILD.gn +++ b/skia/third_party/freetype2/BUILD.gn @@ -21,9 +21,7 @@ if (skia_use_system_freetype2) { public_defines = [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) << 24) | ((FREETYPE_MINOR) << 16) | ((FREETYPE_PATCH) << 8))" ] public_include_dirs = [ "../externals/freetype/include" ] - deps = [ - "//third_party/libpng", - ] + deps = [ "//third_party/libpng" ] include_dirs = [ "." ] defines = [ diff --git a/skia/third_party/harfbuzz/BUILD.gn b/skia/third_party/harfbuzz/BUILD.gn index fd6af89d2d847128c7bd9f17629f172f0a3cdc4e..0d7a9d7f21d6fe4ca3da39ebfcd49693ad7dbf8f 100644 --- a/skia/third_party/harfbuzz/BUILD.gn +++ b/skia/third_party/harfbuzz/BUILD.gn @@ -28,9 +28,7 @@ if (skia_use_system_harfbuzz) { "HAVE_INTEL_ATOMIC_PRIMITIVES", "HAVE_OT", ] - deps = [ - "//third_party/icu", - ] + deps = [ "//third_party/icu" ] public = [ "$_src/hb-blob.h", "$_src/hb-buffer.h", diff --git a/skia/third_party/icu/BUILD.gn b/skia/third_party/icu/BUILD.gn index 50157f0bf1c89c2c97beba5cf98ceefe55ce883a..f7a0fb263cbfa335ce33deb9ccfc2d34e7f24a2f 100644 --- a/skia/third_party/icu/BUILD.gn +++ b/skia/third_party/icu/BUILD.gn @@ -36,14 +36,11 @@ if (skia_use_system_icu) { } action("make_data_assembly") { if (target_cpu == "wasm") { - _u_icu_version_major_num = "63" # defined in source/common/unicode/uvernum.h + _u_icu_version_major_num = + "63" # defined in source/common/unicode/uvernum.h script = "make_data_cpp.py" - inputs = [ - "$data_dir/icudtl.dat", - ] - outputs = [ - data_assembly, - ] + inputs = [ "$data_dir/icudtl.dat" ] + outputs = [ data_assembly ] args = [ "icudt${_u_icu_version_major_num}_dat", rebase_path(inputs[0], root_build_dir), @@ -51,12 +48,8 @@ if (skia_use_system_icu) { ] } else { script = "../externals/icu/scripts/make_data_assembly.py" - inputs = [ - "$data_dir/icudtl.dat", - ] - outputs = [ - "$data_assembly", - ] + inputs = [ "$data_dir/icudtl.dat" ] + outputs = [ "$data_assembly" ] args = [ rebase_path(inputs[0], root_build_dir), rebase_path(data_assembly, root_build_dir), @@ -92,9 +85,7 @@ if (skia_use_system_icu) { } sources = icu_sources if (is_win) { - deps = [ - ":icudata", - ] + deps = [ ":icudata" ] public_defines += [ "U_NOEXCEPT=", "U_STATIC_IMPLEMENTATION", @@ -106,21 +97,13 @@ if (skia_use_system_icu) { ] } else { sources += [ "$data_assembly" ] - deps = [ - ":make_data_assembly", - ] + deps = [ ":make_data_assembly" ] } } copy("icudata") { - sources = [ - "../externals/icu/common/icudtl.dat", - ] - outputs = [ - "$root_out_dir/icudtl.dat", - ] - data = [ - "$root_out_dir/icudtl.dat", - ] + sources = [ "../externals/icu/common/icudtl.dat" ] + outputs = [ "$root_out_dir/icudtl.dat" ] + data = [ "$root_out_dir/icudtl.dat" ] } } diff --git a/skia/third_party/libpng/BUILD.gn b/skia/third_party/libpng/BUILD.gn index 8c3f6f5edd3c7d8b4a832829c0ccad307144bd03..217dbdd185d76af1db641f06e75c0038b5a00ad3 100644 --- a/skia/third_party/libpng/BUILD.gn +++ b/skia/third_party/libpng/BUILD.gn @@ -21,9 +21,7 @@ if (skia_use_system_libpng) { ] defines = [ "PNG_SET_OPTION_SUPPORTED" ] - deps = [ - "//third_party/zlib", - ] + deps = [ "//third_party/zlib" ] sources = [ "../externals/libpng/png.c", "../externals/libpng/pngerror.c", diff --git a/skia/third_party/libwebp/BUILD.gn b/skia/third_party/libwebp/BUILD.gn index cdb645f206eb77eb41ffb085fedd05b61126b233..b3ed5788652722abfed5d6d449c3b042693084b2 100644 --- a/skia/third_party/libwebp/BUILD.gn +++ b/skia/third_party/libwebp/BUILD.gn @@ -54,9 +54,7 @@ if (skia_use_system_libwebp) { "../externals/libwebp", ] - deps = [ - ":libwebp_sse41", - ] + deps = [ ":libwebp_sse41" ] if (is_android) { deps += [ "//third_party/cpu-features" ] } diff --git a/skia/third_party/native_app_glue/BUILD.gn b/skia/third_party/native_app_glue/BUILD.gn index a25065bb605c3497d0ae0dfa0d74adb14e0f5e21..463cfb26a6edd381c42e16f691f067aadd5e3aaa 100644 --- a/skia/third_party/native_app_glue/BUILD.gn +++ b/skia/third_party/native_app_glue/BUILD.gn @@ -11,7 +11,5 @@ import("../third_party.gni") third_party("native_app_glue") { public_include_dirs = [ "$ndk/sources/android/native_app_glue" ] - sources = [ - "$ndk/sources/android/native_app_glue/android_native_app_glue.c", - ] + sources = [ "$ndk/sources/android/native_app_glue/android_native_app_glue.c" ] } diff --git a/skia/third_party/sfntly/BUILD.gn b/skia/third_party/sfntly/BUILD.gn index 4c0c618996eaab40719321fe98cdd490a03a7628..e1adb333d18cff1c43ca14ebbec56479f8219ba3 100644 --- a/skia/third_party/sfntly/BUILD.gn +++ b/skia/third_party/sfntly/BUILD.gn @@ -14,9 +14,7 @@ if (skia_use_icu) { _src = "../externals/sfntly/cpp/src" public_include_dirs = [ _src ] defines = [ "SFNTLY_NO_EXCEPTION" ] - public_deps = [ - "//third_party/icu", - ] + public_deps = [ "//third_party/icu" ] deps = [] if (is_win) { defines += [ "WIN32" ] diff --git a/skia/third_party/skcms/skcms.gni b/skia/third_party/skcms/skcms.gni index c0ebdbe3341c2f81b20cd4800c47392d8875ab38..819afaef130fd46b241275576f764d0fecc2eb3d 100644 --- a/skia/third_party/skcms/skcms.gni +++ b/skia/third_party/skcms/skcms.gni @@ -3,6 +3,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -skcms_sources = [ - "skcms.cc", -] +skcms_sources = [ "skcms.cc" ] diff --git a/skia/third_party/spirv-tools/BUILD.gn b/skia/third_party/spirv-tools/BUILD.gn index 039c47256ea60e062669fb655aa660da8f67a6b8..37c2c9252f32521e3f9b157ac7f1b7bba044e3a1 100644 --- a/skia/third_party/spirv-tools/BUILD.gn +++ b/skia/third_party/spirv-tools/BUILD.gn @@ -4,9 +4,7 @@ template("spirv_core_tables") { version = invoker.version action("spirv_core_tables_" + target_name) { script = "../externals/spirv-tools/utils/generate_grammar_tables.py" - sources = [ - "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json", - ] + sources = [ "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json" ] outputs = [ "$root_out_dir/spirv-tools/core.insts-$version.inc", "$root_out_dir/spirv-tools/operand.kinds-$version.inc", @@ -43,9 +41,7 @@ action("spirv_glsl_tables") { "../externals/spirv-headers/include/spirv/1.0/extinst.glsl.std.450.grammar.json", "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", ] - outputs = [ - "$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc", - ] + outputs = [ "$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc" ] args = [ "--spirv-core-grammar=" + rebase_path( "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", @@ -66,9 +62,7 @@ action("spirv_extension_enum") { "../externals/spirv-headers/include/spirv/1.0/extinst.glsl.std.450.grammar.json", "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", ] - outputs = [ - "$root_out_dir/spirv-tools/extension_enum.inc", - ] + outputs = [ "$root_out_dir/spirv-tools/extension_enum.inc" ] args = [ "--spirv-core-grammar=" + rebase_path( "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", @@ -88,9 +82,7 @@ action("spirv_opencl_tables") { "../externals/spirv-headers/include/spirv/1.0/extinst.opencl.std.100.grammar.json", "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", ] - outputs = [ - "$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc", - ] + outputs = [ "$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc" ] args = [ "--spirv-core-grammar=" + rebase_path( "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", @@ -109,12 +101,9 @@ template("spirv_vendor_tables") { vendor_table = invoker.vendor_table action("spirv_vendor_tables_" + target_name) { script = "../externals/spirv-tools/utils/generate_grammar_tables.py" - sources = [ - "../externals/spirv-tools/source/extinst.$vendor_table.grammar.json", - ] - outputs = [ - "$root_out_dir/spirv-tools/$vendor_table.insts.inc", - ] + sources = + [ "../externals/spirv-tools/source/extinst.$vendor_table.grammar.json" ] + outputs = [ "$root_out_dir/spirv-tools/$vendor_table.insts.inc" ] args = [ "--extinst-vendor-grammar=" + rebase_path( "../externals/spirv-tools/source/extinst.$vendor_table.grammar.json", @@ -144,12 +133,8 @@ spirv_vendor_tables("amd_shader_ballot") { action("spirv_build_version") { script = "../externals/spirv-tools/utils/update_build_version.py" - sources = [ - "../externals/spirv-tools/CHANGES", - ] - outputs = [ - "$root_out_dir/spirv-tools/build-version.inc", - ] + sources = [ "../externals/spirv-tools/CHANGES" ] + outputs = [ "$root_out_dir/spirv-tools/build-version.inc" ] args = [ rebase_path("../externals/spirv-tools", root_build_dir), rebase_path("$root_out_dir/spirv-tools/build-version.inc", root_build_dir), @@ -158,12 +143,8 @@ action("spirv_build_version") { action("spirv_generators") { script = "../externals/spirv-tools/utils/generate_registry_tables.py" - sources = [ - "../externals/spirv-headers/include/spirv/spir-v.xml", - ] - outputs = [ - "$root_out_dir/spirv-tools/generators.inc", - ] + sources = [ "../externals/spirv-headers/include/spirv/spir-v.xml" ] + outputs = [ "$root_out_dir/spirv-tools/generators.inc" ] args = [ "--xml=" + rebase_path("../externals/spirv-headers/include/spirv/spir-v.xml", diff --git a/skia/third_party/wuffs/BUILD.gn b/skia/third_party/wuffs/BUILD.gn index e0aa7308396a5053d2b08359117ec8891bdd9434..a5d32a7ed5fa55a6c2c94e8d1fcd26f93ff4bd34 100644 --- a/skia/third_party/wuffs/BUILD.gn +++ b/skia/third_party/wuffs/BUILD.gn @@ -45,7 +45,5 @@ third_party("wuffs") { "WUFFS_CONFIG__MODULE__LZW", ] - sources = [ - "../externals/wuffs/release/c/wuffs-v0.2.c", - ] + sources = [ "../externals/wuffs/release/c/wuffs-v0.2.c" ] } diff --git a/skia/third_party/zlib/BUILD.gn b/skia/third_party/zlib/BUILD.gn index a1e4836bf6d5638be9fca11bd19e91cb3e991b33..40d00e916f23ed45035b231931d2330561dc8d9a 100644 --- a/skia/third_party/zlib/BUILD.gn +++ b/skia/third_party/zlib/BUILD.gn @@ -17,9 +17,7 @@ if (skia_use_system_zlib) { third_party("zlib") { public_include_dirs = [ "../externals/zlib" ] - deps = [ - ":zlib_x86", - ] + deps = [ ":zlib_x86" ] sources = [ "../externals/zlib/adler32.c", "../externals/zlib/compress.c", @@ -55,8 +53,6 @@ third_party("zlib_x86") { ] } } else { - sources = [ - "../externals/zlib/simd_stub.c", - ] + sources = [ "../externals/zlib/simd_stub.c" ] } }