diff options
| author |  Mike Reed <reed@google.com> | 2017-01-13 22:43:16 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-13 22:43:33 +0000 |
| commit | 986480a71f4e860663ced7ad90a1fe346a164afb (patch) | |
| tree | 8a401376a6cec3ae6302f86a5a04d38e2a532b36 /src/core/SkCanvas.cpp | |
| parent | 2f719a6b9214997e4cc24646d4b280038962b836 (diff) | |
Revert "move SkDevice.h and SkBitmapDevice.h contents in to src headers"
This reverts commit 2f719a6b9214997e4cc24646d4b280038962b836.
Reason for revert: <INSERT REASONING HERE>
swf/transform/jsrunner/swiffy_canvas.h
caller included SkDevice.h, but really wanted SkBitmap and SkColor
Original change's description:
> move SkDevice.h and SkBitmapDevice.h contents in to src headers
>
> BUG=skia:
>
> Change-Id: I3d8d313f0500c13db21cb973fed4064ec3816912
> Reviewed-on: https://skia-review.googlesource.com/7082
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bungeman@google.com,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I40f7f1e4ad62685facdd39492da7a0b105178221
Reviewed-on: https://skia-review.googlesource.com/7087
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 3d3d45ffe4..e3374dde52 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkBitmapDevice.h" #include "SkCanvas.h" #include "SkCanvasPriv.h" #include "SkClipStack.h" @@ -28,7 +29,6 @@ #include "SkPicture.h" #include "SkRadialShadowMapShader.h" #include "SkRasterClip.h" -#include "SkRasterDevice.h" #include "SkRasterHandleAllocator.h" #include "SkReadPixelsRec.h" #include "SkRRect.h" |