diff options
author | reed <reed@chromium.org> | 2015-08-04 18:44:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 18:44:57 -0700 |
commit | fb8c1fcab19c99b56d2fdcf6234751d6f0465142 (patch) | |
tree | 983506af7eb10ffa837e170bcafab650a8d7d477 /samplecode | |
parent | 7403d87db8e43d4c2b5b25ac22a0ebc22bd09d69 (diff) |
Revert of IWYU: 'core' target, files starting A-C. (patchset #5 id:80001 of https://codereview.chromium.org/1265033002/ )
Reason for revert:
revert to unblock DEPS roll
../../chrome/browser/chromeos/display/overscan_calibrator.cc:43:10: error: variable has incomplete type 'SkPath'
SkPath base_path;
Original issue's description:
> IWYU: 'core' target, files starting A-C.
>
> TBR=reed@google.com
> Verbal lgtm, does not change API.
>
> Committed: https://skia.googlesource.com/skia/+/7403d87db8e43d4c2b5b25ac22a0ebc22bd09d69
TBR=reed@google.com,mtklein@google.com,bungeman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1273613002
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleAAClip.cpp | 5 | ||||
-rw-r--r-- | samplecode/SampleChart.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleCircle.cpp | 5 | ||||
-rw-r--r-- | samplecode/SampleClip.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleClipDrawMatch.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleClock.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleDitherBitmap.cpp | 7 | ||||
-rw-r--r-- | samplecode/SampleEmptyPath.cpp | 3 | ||||
-rw-r--r-- | samplecode/SampleFilterQuality.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleIdentityScale.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleLayerMask.cpp | 3 | ||||
-rw-r--r-- | samplecode/SamplePathFuzz.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleShaderText.cpp | 3 | ||||
-rw-r--r-- | samplecode/SampleStringArt.cpp | 2 |
14 files changed, 10 insertions, 26 deletions
diff --git a/samplecode/SampleAAClip.cpp b/samplecode/SampleAAClip.cpp index 78baf3d554..a1ee67b75f 100644 --- a/samplecode/SampleAAClip.cpp +++ b/samplecode/SampleAAClip.cpp @@ -7,10 +7,9 @@ */ #include "SampleCode.h" -#include "SkAAClip.h" -#include "SkCanvas.h" -#include "SkPath.h" #include "SkView.h" +#include "SkCanvas.h" +#include "SkAAClip.h" static void testop(const SkIRect& r0, const SkIRect& r1, SkRegion::Op op, const SkIRect& expectedR) { diff --git a/samplecode/SampleChart.cpp b/samplecode/SampleChart.cpp index 8d158f1506..4c128a90d7 100644 --- a/samplecode/SampleChart.cpp +++ b/samplecode/SampleChart.cpp @@ -8,7 +8,6 @@ #include "SampleCode.h" #include "SkCanvas.h" #include "SkPaint.h" -#include "SkPath.h" #include "SkRandom.h" #include "SkView.h" diff --git a/samplecode/SampleCircle.cpp b/samplecode/SampleCircle.cpp index 938b5752ea..9cc927e47d 100644 --- a/samplecode/SampleCircle.cpp +++ b/samplecode/SampleCircle.cpp @@ -1,16 +1,15 @@ + /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "SampleCode.h" +#include "SkView.h" #include "SkCanvas.h" #include "SkDevice.h" #include "SkPaint.h" -#include "SkPath.h" -#include "SkView.h" // ensure that we don't accidentally screw up the bounds when the oval is // fractional, and the impl computes the center and radii, and uses them to diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp index 2014278ceb..3a38724e9c 100644 --- a/samplecode/SampleClip.cpp +++ b/samplecode/SampleClip.cpp @@ -11,7 +11,6 @@ #include "SkColorPriv.h" #include "SkDevice.h" #include "SkPaint.h" -#include "SkPath.h" #include "SkRandom.h" #define W 150 diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp index c79c87239d..6a2a37b190 100644 --- a/samplecode/SampleClipDrawMatch.cpp +++ b/samplecode/SampleClipDrawMatch.cpp @@ -8,8 +8,6 @@ #include "SampleCode.h" #include "SkCanvas.h" #include "SkInterpolator.h" -#include "SkPath.h" -#include "SkRRect.h" #include "SkTime.h" // This slide tests out the match up between BW clipping and rendering. It can diff --git a/samplecode/SampleClock.cpp b/samplecode/SampleClock.cpp index 9b1e3e0499..ec71f0fd1c 100644 --- a/samplecode/SampleClock.cpp +++ b/samplecode/SampleClock.cpp @@ -7,7 +7,6 @@ #include "SampleCode.h" #include "SkCanvas.h" -#include "SkPath.h" #include "SkRandom.h" #include "SkRRect.h" #include "SkTime.h" diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp index 9af5ce576f..d825c71a50 100644 --- a/samplecode/SampleDitherBitmap.cpp +++ b/samplecode/SampleDitherBitmap.cpp @@ -1,17 +1,16 @@ + /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "SampleCode.h" -#include "SkCanvas.h" #include "SkColorPriv.h" #include "SkGradientShader.h" -#include "SkPath.h" -#include "SkUtils.h" #include "SkView.h" +#include "SkCanvas.h" +#include "SkUtils.h" static void draw_rect(SkCanvas* canvas, const SkRect& r, const SkPaint& p) { canvas->drawRect(r, p); diff --git a/samplecode/SampleEmptyPath.cpp b/samplecode/SampleEmptyPath.cpp index 6071f42753..53e2199853 100644 --- a/samplecode/SampleEmptyPath.cpp +++ b/samplecode/SampleEmptyPath.cpp @@ -1,15 +1,14 @@ + /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "SampleCode.h" #include "SkView.h" #include "SkCanvas.h" #include "SkPaint.h" -#include "SkPath.h" #include "SkRandom.h" #include "SkString.h" diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp index 12a04a6d60..64b7f55322 100644 --- a/samplecode/SampleFilterQuality.cpp +++ b/samplecode/SampleFilterQuality.cpp @@ -12,7 +12,6 @@ #include "SkAnimTimer.h" #include "SkCanvas.h" #include "SkInterpolator.h" -#include "SkPath.h" #include "SkSurface.h" #include "SkRandom.h" #include "SkTime.h" diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp index 3302d27ed8..4450d617a5 100644 --- a/samplecode/SampleIdentityScale.cpp +++ b/samplecode/SampleIdentityScale.cpp @@ -13,7 +13,6 @@ #include "SkCanvas.h" #include "SkColorPriv.h" #include "SkImageDecoder.h" -#include "SkPath.h" #include "SkRandom.h" #include "SkStream.h" #include "SkTime.h" diff --git a/samplecode/SampleLayerMask.cpp b/samplecode/SampleLayerMask.cpp index f5b88229ea..86a092cd06 100644 --- a/samplecode/SampleLayerMask.cpp +++ b/samplecode/SampleLayerMask.cpp @@ -1,14 +1,13 @@ + /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "SampleCode.h" #include "SkCanvas.h" #include "SkPaint.h" -#include "SkPath.h" #include "SkView.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/samplecode/SamplePathFuzz.cpp b/samplecode/SamplePathFuzz.cpp index 70a052f80a..0955ce9f34 100644 --- a/samplecode/SamplePathFuzz.cpp +++ b/samplecode/SamplePathFuzz.cpp @@ -14,7 +14,6 @@ #include "SkColor.h" #include "SkTDArray.h" #include "SkRandom.h" -#include "SkRRect.h" enum RandomAddPath { kMoveToPath, diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp index cf7cf96a43..9fdae842ab 100644 --- a/samplecode/SampleShaderText.cpp +++ b/samplecode/SampleShaderText.cpp @@ -6,10 +6,9 @@ */ #include "SampleCode.h" +#include "SkView.h" #include "SkCanvas.h" #include "SkGradientShader.h" -#include "SkPath.h" -#include "SkView.h" static void makebm(SkBitmap* bm, int w, int h) { bm->allocN32Pixels(w, h); diff --git a/samplecode/SampleStringArt.cpp b/samplecode/SampleStringArt.cpp index 5bc667bb7e..0e711b09d7 100644 --- a/samplecode/SampleStringArt.cpp +++ b/samplecode/SampleStringArt.cpp @@ -4,10 +4,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "SampleCode.h" #include "SkCanvas.h" -#include "SkPath.h" // Reproduces https://code.google.com/p/chromium/issues/detail?id=279014 |