Some iwyu for tests which will otherwise break.

A change currently in progress would break these test files since they
aren't including what they use. Make them include what they use so they
don't break in the future.

Change-Id: I25d8d57631706dec0d0197b3759c6c18a0fe3aa0
Reviewed-on: https://skia-review.googlesource.com/114465
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

5 files changed, 92 insertions, 33 deletions

diff --git a/gm/coloremoji_blendmodes.cpp b/gm/coloremoji_blendmodes.cpp
index 6cf891baef..1e1608d648 100644
--- a/gm/coloremoji_blendmodes.cpp
+++ b/gm/coloremoji_blendmodes.cpp
@@ -4,12 +4,27 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "gm.h"
-#include "sk_tool_utils.h"
+
 #include "SkBitmap.h"
+#include "SkBlendMode.h"
+#include "SkCanvas.h"
+#include "SkColor.h"
+#include "SkFontStyle.h"
 #include "SkGradientShader.h"
+#include "SkImageInfo.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
 #include "SkShader.h"
+#include "SkSize.h"
+#include "SkString.h"
+#include "SkTypeface.h"
+#include "SkTypes.h"
 #include "SkUtils.h"
+#include "gm.h"
+#include "sk_tool_utils.h"
 
 namespace skiagm {
 
diff --git a/gm/textblob.cpp b/gm/textblob.cpp
index d30f92f3bf..549ea8fff2 100644
--- a/gm/textblob.cpp
+++ b/gm/textblob.cpp
@@ -5,13 +5,24 @@
  * found in the LICENSE file.
  */
 
-#include "gm.h"
-#include "sk_tool_utils.h"
-
 #include "SkCanvas.h"
+#include "SkColor.h"
+#include "SkFontStyle.h"
+#include "SkPaint.h"
 #include "SkPoint.h"
-#include "SkTextBlob.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
+#include "SkSize.h"
+#include "SkString.h"
 #include "SkTDArray.h"
+#include "SkTextBlob.h"
+#include "SkTypeface.h"
+#include "SkTypes.h"
+#include "gm.h"
+#include "sk_tool_utils.h"
+
+#include <cstring>
 
 namespace  {
 
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index e85c87bc66..2074856fcb 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -5,18 +5,28 @@
  * found in the LICENSE file.
  */
 
-#include "sk_tool_utils.h"
 #include "SampleCode.h"
-#include "SkView.h"
+#include "SkBlendMode.h"
 #include "SkCanvas.h"
+#include "SkClipOpPriv.h"
+#include "SkColor.h"
+#include "SkImageInfo.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
 #include "SkPath.h"
+#include "SkPoint.h"
 #include "SkPointPriv.h"
-#include "SkRegion.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
 #include "SkShader.h"
-#include "SkUtils.h"
-#include "SkImage.h"
+#include "SkString.h"
 #include "SkSurface.h"
-#include "SkClipOpPriv.h"
+#include "SkTypes.h"
+#include "SkView.h"
+#include "sk_tool_utils.h"
+
+class SkEvent;
 
 #define FAT_PIXEL_COLOR     SK_ColorBLACK
 #define PIXEL_CENTER_SIZE   3
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
index 59d6ed5a1e..6d17026fea 100644
--- a/samplecode/SampleQuadStroker.cpp
+++ b/samplecode/SampleQuadStroker.cpp
@@ -5,18 +5,35 @@
  * found in the LICENSE file.
  */
 
-#include "sk_tool_utils.h"
 #include "SampleCode.h"
-#include "SkView.h"
+#include "SkBlendMode.h"
 #include "SkCanvas.h"
+#include "SkColor.h"
 #include "SkGeometry.h"
+#include "SkImageInfo.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
+#include "SkPath.h"
 #include "SkPathMeasure.h"
+#include "SkPoint.h"
 #include "SkPointPriv.h"
-#include "SkRandom.h"
 #include "SkRRect.h"
-#include "SkColorPriv.h"
-#include "SkStrokerPriv.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
+#include "SkShader.h"
+#include "SkString.h"
+#include "SkStroke.h"
 #include "SkSurface.h"
+#include "SkTArray.h"
+#include "SkTemplates.h"
+#include "SkTypes.h"
+#include "SkView.h"
+#include "sk_tool_utils.h"
+
+#include <cfloat>
+
+class SkEvent;
 
 static bool hittest(const SkPoint& target, SkScalar x, SkScalar y) {
     const SkScalar TOL = 7;
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 425b25a153..084b8616b7 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -5,35 +5,41 @@
  * found in the LICENSE file.
  */
 
-#include "SkBigPicture.h"
+#include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
-#include "SkBlurImageFilter.h"
+#include "SkBigPicture.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColorMatrixFilter.h"
-#include "SkColorPriv.h"
-#include "SkDashPathEffect.h"
+#include "SkClipOp.h"
+#include "SkClipOpPriv.h"
+#include "SkColor.h"
 #include "SkData.h"
-#include "SkImageGenerator.h"
-#include "SkImageEncoder.h"
-#include "SkImageGenerator.h"
-#include "SkMD5.h"
+#include "SkFontStyle.h"
+#include "SkImageInfo.h"
+#include "SkMatrix.h"
 #include "SkMiniRecorder.h"
 #include "SkPaint.h"
+#include "SkPath.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkPixelRef.h"
-#include "SkRectPriv.h"
-#include "SkRRect.h"
 #include "SkRandom.h"
-#include "SkRecord.h"
+#include "SkRect.h"
+#include "SkRectPriv.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
 #include "SkShader.h"
 #include "SkStream.h"
-#include "sk_tool_utils.h"
-
+#include "SkTypeface.h"
+#include "SkTypes.h"
 #include "Test.h"
 
-#include "SkLumaColorFilter.h"
-#include "SkColorFilterImageFilter.h"
+#include <memory>
+
+class SkRRect;
+class SkRegion;
+template <typename T> class SkTDArray;
+
 
 static void make_bm(SkBitmap* bm, int w, int h, SkColor color, bool immutable) {
     bm->allocN32Pixels(w, h);