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 /src/core/SkBitmap.cpp | |
| 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 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 97b0db6f20..aa26bdcab3 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1,3 +1,4 @@ + /* * Copyright 2008 The Android Open Source Project * @@ -5,22 +6,23 @@ * found in the LICENSE file. */ + #include "SkAtomics.h" #include "SkBitmap.h" #include "SkColorPriv.h" -#include "SkData.h" -#include "SkFilterQuality.h" +#include "SkDither.h" +#include "SkFlattenable.h" +#include "SkImagePriv.h" #include "SkMallocPixelRef.h" #include "SkMask.h" -#include "SkMath.h" +#include "SkPackBits.h" #include "SkPixelRef.h" #include "SkReadBuffer.h" -#include "SkRect.h" -#include "SkScalar.h" #include "SkUnPreMultiply.h" +#include "SkUtils.h" +#include "SkValidationUtils.h" #include "SkWriteBuffer.h" - -#include <string.h> +#include <new> static bool reset_return_false(SkBitmap* bm) { bm->reset(); @@ -747,6 +749,9 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const { /////////////////////////////////////////////////////////////////////////////// +#include "SkCanvas.h" +#include "SkPaint.h" + bool SkBitmap::canCopyTo(SkColorType dstColorType) const { const SkColorType srcCT = this->colorType(); @@ -1216,7 +1221,6 @@ void SkBitmap::validate() const { #endif #ifndef SK_IGNORE_TO_STRING -#include "SkString.h" void SkBitmap::toString(SkString* str) const { static const char* gColorTypeNames[kLastEnum_SkColorType + 1] = { |