aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-01-13 22:43:16 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-13 22:43:33 +0000
commit986480a71f4e860663ced7ad90a1fe346a164afb (patch)
tree8a401376a6cec3ae6302f86a5a04d38e2a532b36 /gn
parent2f719a6b9214997e4cc24646d4b280038962b836 (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 'gn')
-rw-r--r--gn/core.gni4
1 files changed, 2 insertions, 2 deletions
diff --git a/gn/core.gni b/gn/core.gni
index edad799111..e5d72b33fc 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -23,7 +23,6 @@ skia_core_sources = [
"$_src/core/SkAutoKern.h",
"$_src/core/SkAutoPixmapStorage.h",
"$_src/core/SkAutoPixmapStorage.cpp",
- "$_src/core/SkBaseDevice.h",
"$_src/core/SkBBHFactory.cpp",
"$_src/core/SkBBoxHierarchy.h",
"$_src/core/SkBigPicture.cpp",
@@ -255,7 +254,6 @@ skia_core_sources = [
"$_src/core/SkRadialShadowMapShader.cpp",
"$_src/core/SkRadialShadowMapShader.h",
"$_src/core/SkRasterClip.cpp",
- "$_src/core/SkRasterDevice.h",
"$_src/core/SkRasterPipeline.cpp",
"$_src/core/SkRasterPipelineBlitter.cpp",
"$_src/core/SkRasterizer.cpp",
@@ -383,6 +381,7 @@ 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",
@@ -390,6 +389,7 @@ 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",