aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2016-11-28 09:26:31 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-28 14:58:41 +0000
commit3b66ab6f9fdc6eacdf0ee1921da28751de30c018 (patch)
treee81d2a52f48030084c53260a0d3b1bcf0463c96c /src/image
parent781c3c14629342ed3eb00d153822c751406ad80b (diff)
GrTextureProducer cleanup, phase one: Bitmap and Image makers
Split these into their own files, and actually name the files after the classes they contain. The top three classes in the hierarchy still need attention, but those are going to be trickier. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5195 Change-Id: I295f4d50e35748eac38a31f302e14b5b62653c55 Reviewed-on: https://skia-review.googlesource.com/5195 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/image')
-rw-r--r--src/image/SkImage_Gpu.cpp3
-rw-r--r--src/image/SkImage_Raster.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 02f4d69519..780bfbe4bf 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -10,10 +10,11 @@
#include <type_traits>
#include "SkAutoPixmapStorage.h"
+#include "GrBitmapTextureMaker.h"
#include "GrCaps.h"
#include "GrContext.h"
+#include "GrImageTextureMaker.h"
#include "GrRenderTargetContext.h"
-#include "GrImageIDTextureAdjuster.h"
#include "GrTexturePriv.h"
#include "effects/GrYUVEffect.h"
#include "SkCanvas.h"
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index dcc60c3e65..6fc03b2dce 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -17,7 +17,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
-#include "GrImageIDTextureAdjuster.h"
+#include "GrTextureParamsAdjuster.h"
#include "SkGr.h"
#include "SkGrPriv.h"
#endif