From 6b1da0a53864530257906e31f0023a7b8ffccd07 Mon Sep 17 00:00:00 2001 From: benjaminwagner Date: Thu, 29 Sep 2016 09:36:29 -0700 Subject: Revert of Add SK_SUPPORT_LEGACY_HAIRLINE_END_CAP to work around dependent test failure. (patchset #1 id:1 of https://codereview.chromium.org/2379843002/ ) Reason for revert: Dependent test has been fixed. Original issue's description: > Add SK_SUPPORT_LEGACY_HAIRLINE_END_CAP to work around dependent test failure. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2379843002 > > Committed: https://skia.googlesource.com/skia/+/aa6ef3ebc60e0f70db0e599f4cd34d5be06486c9 TBR=caryclark@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2379993004 --- public.bzl | 1 - src/core/SkScan_Hairline.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/public.bzl b/public.bzl index 22753a7cec..5cfd7d5d04 100644 --- a/public.bzl +++ b/public.bzl @@ -601,7 +601,6 @@ DEFINES_ALL = [ "SK_SUPPORT_LEGACY_ARITHMETICMODE", "SK_SUPPORT_LEGACY_COLORFILTER_PTR", "SK_SUPPORT_LEGACY_CREATESHADER_PTR", - "SK_SUPPORT_LEGACY_HAIRLINE_END_CAP", "SK_SUPPORT_LEGACY_IMAGEFACTORY", "SK_SUPPORT_LEGACY_IMAGEFILTER_PTR", "SK_SUPPORT_LEGACY_MASKFILTER_PTR", diff --git a/src/core/SkScan_Hairline.cpp b/src/core/SkScan_Hairline.cpp index cc57bb6d63..ce3fe2b604 100644 --- a/src/core/SkScan_Hairline.cpp +++ b/src/core/SkScan_Hairline.cpp @@ -593,12 +593,10 @@ void hair_path(const SkPath& path, const SkRasterClip& rclip, SkBlitter* blitter break; } if (SkPaint::kButt_Cap != capStyle) { -#if !defined(SK_SUPPORT_LEGACY_HAIRLINE_END_CAP) if (prevVerb == SkPath::kMove_Verb && verb >= SkPath::kLine_Verb && verb <= SkPath::kCubic_Verb) { firstPt = pts[0]; // the curve moved the initial point, so close to it instead } -#endif prevVerb = verb; } } -- cgit v1.2.3