aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar Leon Scroggins III <scroggo@google.com>2018-05-30 15:33:46 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-01 12:53:25 +0000
commit22f673d42087853a151fcd5e95c129be83065cdc (patch)
treee4e711677a1e6a02b261acd9346c587ff260d7a0 /src/gpu
parent9ea47bedb945fe51c7805b4f2defccccb8249865 (diff)
Move SkColorTable to src/codec
It is no longer needed anywhere else, and simply happens to be an implementation detail of SkCodec (at least for now). Remove references to SkColorTable in other classes, and clean up some includes of SkConvertPixels I found along the way. Remove unused includes/methods on SkColorTable Change-Id: I46c8e46f5b77c37710b6cf595d48107d55871d52 Reviewed-on: https://skia-review.googlesource.com/130845 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrContext.cpp1
-rw-r--r--src/gpu/SkGr.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 3d57f9818d..c9c476fb1a 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -27,7 +27,6 @@
#include "GrTextureStripAtlas.h"
#include "GrTracing.h"
#include "SkAutoPixmapStorage.h"
-#include "SkConvertPixels.h"
#include "SkDeferredDisplayList.h"
#include "SkGr.h"
#include "SkImageInfoPriv.h"
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index a37523fc06..528d133e2d 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -21,7 +21,6 @@
#include "SkBlendModePriv.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
-#include "SkConvertPixels.h"
#include "SkData.h"
#include "SkImage_Base.h"
#include "SkImageInfoPriv.h"