aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2018-02-06 10:17:08 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-06 15:42:15 +0000
commite602f395813aab8242afad356008b8e79911adbb (patch)
tree62ce31c5611db29cbb3959ef221b39279879416a /include
parent73f28bb71a0bf1954c008c66e208b66306ee4240 (diff)
move GrColor.h to private, IWYU
Bug: skia: Change-Id: I0f0dabd7cc54cb7786f53bd6da0c0c012375037e Reviewed-on: https://skia-review.googlesource.com/104160 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/core/SkImage.h1
-rw-r--r--include/core/SkShader.h2
-rw-r--r--include/gpu/GrBlend.h2
-rw-r--r--include/gpu/GrContext.h1
-rw-r--r--include/private/GrColor.h (renamed from include/gpu/GrColor.h)0
5 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index deb0313faf..9e4e237db4 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -8,6 +8,7 @@
#ifndef SkImage_DEFINED
#define SkImage_DEFINED
+#include "GrTypes.h"
#include "SkFilterQuality.h"
#include "SkImageInfo.h"
#include "SkImageEncoder.h"
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 290d09fc87..a5ba12ec2f 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -9,11 +9,11 @@
#define SkShader_DEFINED
#include "SkBlendMode.h"
+#include "SkColor.h"
#include "SkFilterQuality.h"
#include "SkFlattenable.h"
#include "SkImageInfo.h"
#include "SkMatrix.h"
-#include "../gpu/GrColor.h"
class SkArenaAlloc;
class SkBitmap;
diff --git a/include/gpu/GrBlend.h b/include/gpu/GrBlend.h
index 30b0b9b6e0..8c968f2d2e 100644
--- a/include/gpu/GrBlend.h
+++ b/include/gpu/GrBlend.h
@@ -9,7 +9,7 @@
#ifndef GrBlend_DEFINED
#define GrBlend_DEFINED
-#include "GrColor.h"
+#include "GrTypes.h"
#include "../private/SkTLogic.h"
/**
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index d0ca90e0f0..df9b85bacd 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -9,7 +9,6 @@
#define GrContext_DEFINED
#include "GrCaps.h"
-#include "GrColor.h"
#include "SkMatrix.h"
#include "SkPathEffect.h"
#include "SkTypes.h"
diff --git a/include/gpu/GrColor.h b/include/private/GrColor.h
index b4a461d738..b4a461d738 100644
--- a/include/gpu/GrColor.h
+++ b/include/private/GrColor.h