diff options
| author |  Brian Osman <brianosman@google.com> | 2017-06-26 13:12:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-26 17:42:00 +0000 |
| commit | cff94e407ebec226ec33871b8191270c4e8057b6 (patch) | |
| tree | cddbacd5dbc08622a2d25ac76de608b78788765f | |
| parent | 4b8d491b2230de6153836113c6864303eeedcd67 (diff) | |
Move threaded BMP device to samples
Currently only referenced by SampleApp, and this squelches false positive
warnings from Clang's thread safety analysis when clients build this code.
Bug: skia:
Change-Id: I710fdc882e05fc5b80977139237028d1408f17db
Reviewed-on: https://skia-review.googlesource.com/20831
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | gn/core.gni | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1136,6 +1136,12 @@ if (skia_enable_tools) { "experimental/SkSetPoly3To3.cpp", "experimental/SkSetPoly3To3_A.cpp", "experimental/SkSetPoly3To3_D.cpp", + + # Relocating these files here, so that clients don't try to build them while they're + # still in active development. Clang's thread safety analysis gets tripped up by + # conditional locks. + "src/core/SkThreadedBMPDevice.cpp", + "src/core/SkThreadedBMPDevice.h", ] deps = [ ":experimental_svg_model", diff --git a/gn/core.gni b/gn/core.gni index 13f1987157..c0eecd9a2a 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -31,8 +31,6 @@ skia_core_sources = [ "$_src/core/SkBitmapController.cpp", "$_src/core/SkBitmapDevice.cpp", "$_src/core/SkBitmapDevice.h", - "$_src/core/SkThreadedBMPDevice.cpp", - "$_src/core/SkThreadedBMPDevice.h", "$_src/core/SkBitmapFilter.h", "$_src/core/SkBitmapProcState.cpp", "$_src/core/SkBitmapProcState.h", |