Skip to content

Commit 81d35a7

Browse files
Mike KleinSkia Commit-Bot
authored andcommitted
rm SkPreConfig.h and SkPostConfig.h
We treat them as part of SkTypes.h, so let's just merge them in? Change-Id: Icd6db3913a679ceb9de09027d17eb9361754b016 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268769 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Reed <reed@google.com>
1 parent ba8ab23 commit 81d35a7

9 files changed

Lines changed: 420 additions & 490 deletions

File tree

gn/core.gni

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ skia_core_public = [
6565
"$_include/core/SkPngChunkReader.h",
6666
"$_include/core/SkPoint.h",
6767
"$_include/core/SkPoint3.h",
68-
"$_include/core/SkPostConfig.h",
69-
"$_include/core/SkPreConfig.h",
7068
"$_include/core/SkPromiseImageTexture.h",
7169
"$_include/core/SkRRect.h",
7270
"$_include/core/SkRSXform.h",

gn/gn_to_bp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def write_config(config_path, defines, platform):
464464
gn_to_bp_utils.WriteUserConfig(config_path, defines)
465465
append_to_file(config_path, '''
466466
// Correct SK_BUILD_FOR flags that may have been set by
467-
// SkPreConfig.h/Android.bp
467+
// SkTypes.h/Android.bp
468468
#ifndef SK_BUILD_FOR_%s
469469
#define SK_BUILD_FOR_%s
470470
#endif

include/config/SkUserConfig.h

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,9 @@
1010
#ifndef SkUserConfig_DEFINED
1111
#define SkUserConfig_DEFINED
1212

13-
/* SkTypes.h, the root of the public header files, includes SkPreConfig.h,
14-
then SkUserConfig.h, then SkPostConfig.h.
15-
16-
SkPreConfig.h runs first, and it is responsible for initializing certain
17-
skia defines.
18-
19-
SkPostConfig.h runs last, and its job is to just check that the final
20-
defines are consistent (i.e. that we don't have mutually conflicting
21-
defines).
22-
23-
SkUserConfig.h (this file) runs in the middle. It gets to change or augment
24-
the list of flags initially set in preconfig, and then postconfig checks
25-
that everything still makes sense.
13+
/* SkTypes.h, the root of the public header files, includes this file
14+
SkUserConfig.h after first initializing certain Skia defines, letting
15+
this file change or augment those flags.
2616
2717
Below are optional defines that add, subtract, or change default behavior
2818
in Skia. Your port can locally edit this file to enable/disable flags as
@@ -39,7 +29,7 @@
3929
each 32bit pixel is in premultiplied form). This code can be very useful
4030
during development, but will slow things down in a shipping product.
4131
42-
By default, these mutually exclusive flags are defined in SkPreConfig.h,
32+
By default, these mutually exclusive flags are defined in SkTypes.h,
4333
based on the presence or absence of NDEBUG, but that decision can be changed
4434
here.
4535
*/

include/core/SkPostConfig.h

Lines changed: 0 additions & 261 deletions
This file was deleted.

0 commit comments

Comments
 (0)