commit d4bdee5f2c4c2c1387426d287f61645b5af8f8e0
author Mike Reed <reed@google.com> Wed Jan 18 00:04:52 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 18 00:05:02 2017 +0000
tree 0793dec332aaee6a9c751909cd1a1f30fb2ae3ab
parent 893c49e209cb1bff9bb5f36338e02ec6709beca5

Revert "move device headers to core"

This reverts commit 98420d0c9b5934d6b08ea994844476ddedd23de0.

Reason for revert: <INSERT REASONING HERE>

blink_headless ImageBufferSurface.cpp

Original change's description:
> move device headers to core
> 
> CANNOT LAND until we update lots of call-sites
> 
> BUG=skia:
> 
> Change-Id: Ibb957dbbf5baf2a2920887e48c03709d1f6c51e1
> Reviewed-on: https://skia-review.googlesource.com/6982
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> 

TBR=bungeman@google.com,fmalita@chromium.org,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

gn/core.gni

diff --git a/gn/core.gni b/gn/core.gni
index 8060836..e3ace02 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -30,7 +30,6 @@
   "$_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",
@@ -103,7 +102,6 @@
   "$_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",
@@ -383,6 +381,7 @@
 
   "$_include/core/SkBBHFactory.h",
   "$_include/core/SkBitmap.h",
+  "$_include/core/SkBitmapDevice.h",
   "$_include/core/SkCanvas.h",
   "$_include/core/SkClipStack.h",
   "$_include/core/SkColor.h",
@@ -390,6 +389,7 @@
   "$_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",

include/core/SkBitmapDevice.h

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

include/core/SkDevice.h

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