diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-15 18:12:40 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-15 18:12:40 +0000 |
| commit | bc75f62774a31ca94188e1910624bac246d550f7 (patch) | |
| tree | c9826fe551d97a076d092a38109810e97fc80e44 /fpdfsdk | |
| parent | d7f51c715146be53186b25ca677e49e164b51527 (diff) | |
| download | pdfium-bc75f62774a31ca94188e1910624bac246d550f7.tar.xz | |
Make fxjs/ pass gn check.
Use allow_circular_includes_from as a crutch for now.
Change-Id: I8c53bafd864048506a77354f57e27cac50369005
Reviewed-on: https://pdfium-review.googlesource.com/c/43989
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/BUILD.gn | 1 | ||||
| -rw-r--r-- | fpdfsdk/fpdfxfa/BUILD.gn | 1 | ||||
| -rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.h | 14 |
3 files changed, 2 insertions, 14 deletions
diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn index cf1fdbf85b..0a696d3b71 100644 --- a/fpdfsdk/BUILD.gn +++ b/fpdfsdk/BUILD.gn @@ -63,6 +63,7 @@ jumbo_source_set("fpdfsdk") { "pwl", ] allow_circular_includes_from = [ + "../fxjs", "formfiller", "pwl", ] diff --git a/fpdfsdk/fpdfxfa/BUILD.gn b/fpdfsdk/fpdfxfa/BUILD.gn index baa615db46..a1c6170826 100644 --- a/fpdfsdk/fpdfxfa/BUILD.gn +++ b/fpdfsdk/fpdfxfa/BUILD.gn @@ -28,6 +28,7 @@ jumbo_source_set("fpdfxfa") { "../../xfa/fxfa", "../../xfa/fxfa/parser", ] + allow_circular_includes_from = [ "../../fxjs" ] configs += [ "../../:pdfium_core_config" ] visibility = [ "../../*" ] } diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h index cc6662be30..93938db648 100644 --- a/fpdfsdk/pwl/cpwl_wnd.h +++ b/fpdfsdk/pwl/cpwl_wnd.h @@ -78,20 +78,6 @@ struct CPWL_Dash { int32_t nPhase; }; -inline bool operator==(const CFX_Color& c1, const CFX_Color& c2) { - return c1.nColorType == c2.nColorType && c1.fColor1 - c2.fColor1 < 0.0001 && - c1.fColor1 - c2.fColor1 > -0.0001 && - c1.fColor2 - c2.fColor2 < 0.0001 && - c1.fColor2 - c2.fColor2 > -0.0001 && - c1.fColor3 - c2.fColor3 < 0.0001 && - c1.fColor3 - c2.fColor3 > -0.0001 && - c1.fColor4 - c2.fColor4 < 0.0001 && c1.fColor4 - c2.fColor4 > -0.0001; -} - -inline bool operator!=(const CFX_Color& c1, const CFX_Color& c2) { - return !(c1 == c2); -} - #define PWL_SCROLLBAR_WIDTH 12.0f #define PWL_SCROLLBAR_TRANSPARENCY 150 #define PWL_DEFAULT_BLACKCOLOR CFX_Color(CFX_Color::kGray, 0) |