Revert "Revert "move device headers to core""

This reverts commit d4bdee5f2c4c2c1387426d287f61645b5af8f8e0.

BUG=skia:

Change-Id: If5c316f8585881e43321412a2a38f97fd4aa5f02
Reviewed-on: https://skia-review.googlesource.com/7315
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

diff --git a/gn/core.gni b/gn/core.gni
index e3ace02..8060836 100644 (file)
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -30,6 +30,7 @@ skia_core_sources = [
   "$_src/core/SkBitmapCache.cpp",
   "$_src/core/SkBitmapController.cpp",
   "$_src/core/SkBitmapDevice.cpp",
+  "$_src/core/SkBitmapDevice.h",
   "$_src/core/SkBitmapFilter.h",
   "$_src/core/SkBitmapProcShader.cpp",
   "$_src/core/SkBitmapProcShader.h",
@@ -102,6 +103,7 @@ skia_core_sources = [
   "$_src/core/SkDeque.cpp",
   "$_src/core/SkDescriptor.h",
   "$_src/core/SkDevice.cpp",
+  "$_src/core/SkDevice.h",
   "$_src/core/SkDeviceLooper.cpp",
   "$_src/core/SkDeviceProfile.cpp",
   "$_src/core/SkDiscardableMemory.h",
@@ -381,7 +383,6 @@ skia_core_sources = [
 
   "$_include/core/SkBBHFactory.h",
   "$_include/core/SkBitmap.h",
-  "$_include/core/SkBitmapDevice.h",
   "$_include/core/SkCanvas.h",
   "$_include/core/SkClipStack.h",
   "$_include/core/SkColor.h",
@@ -389,7 +390,6 @@ skia_core_sources = [
   "$_include/core/SkColorPriv.h",
   "$_include/core/SkData.h",
   "$_include/core/SkDeque.h",
-  "$_include/core/SkDevice.h",
   "$_include/core/SkDrawable.h",
   "$_include/core/SkDrawFilter.h",
   "$_include/core/SkDrawLooper.h",

diff --git a/include/core/SkBitmapDevice.h b/src/core/SkBitmapDevice.h
similarity index 100%
rename from include/core/SkBitmapDevice.h
rename to src/core/SkBitmapDevice.h

diff --git a/include/core/SkDevice.h b/src/core/SkDevice.h
similarity index 100%
rename from include/core/SkDevice.h
rename to src/core/SkDevice.h