commit 986480a71f4e860663ced7ad90a1fe346a164afb
author Mike Reed <reed@google.com> Fri Jan 13 22:43:16 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 13 22:43:33 2017 +0000
tree 8a401376a6cec3ae6302f86a5a04d38e2a532b36
parent 2f719a6b9214997e4cc24646d4b280038962b836

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>

tests/DeviceTest.cpp

diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp
index 43016cf..9fb4fa2 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

tests/LayerDrawLooperTest.cpp

diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 5e2cbb6..8fcbf16 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"

tests/SurfaceTest.cpp

diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 9448862..1f04de5 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"