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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/DeviceTest.cpp | 3 | ||||
| -rw-r--r-- | tests/LayerDrawLooperTest.cpp | 2 | ||||
| -rw-r--r-- | tests/SurfaceTest.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp index 43016cf72d..9fb4fa2eac 100644 --- a/tests/DeviceTest.cpp +++ b/tests/DeviceTest.cpp @@ -5,7 +5,8 @@ * found in the LICENSE file. */ -#include "SkRasterDevice.h" +#include "SkBitmapDevice.h" +#include "SkDevice.h" #include "SkSpecialImage.h" #if SK_SUPPORT_GPU diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp index 5e2cbb61a2..8fcbf1615c 100644 --- a/tests/LayerDrawLooperTest.cpp +++ b/tests/LayerDrawLooperTest.cpp @@ -6,12 +6,12 @@ */ #include "SkBitmap.h" +#include "SkBitmapDevice.h" #include "SkCanvas.h" #include "SkDraw.h" #include "SkLayerDrawLooper.h" #include "SkMatrix.h" #include "SkPaint.h" -#include "SkRasterDevice.h" #include "SkRect.h" #include "SkRefCnt.h" #include "SkScalar.h" diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 9448862813..1f04de5903 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -6,10 +6,10 @@ */ #include <functional> -#include "SkBaseDevice.h" #include "SkCanvas.h" #include "SkColorSpace_Base.h" #include "SkData.h" +#include "SkDevice.h" #include "SkImage_Base.h" #include "SkOverdrawCanvas.h" #include "SkPath.h" |