commit c0bd9f9fe533a7b8644392240c1250195aaee537
author Mike Klein <mtklein@google.com> Tue Apr 23 12:05:21 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 24 16:27:11 2019 +0000
tree 23a6c7d48d9373dbad1e63f1f78a8943e1b75e4a
parent 0c229970754242a038c91328873197c62d60770d

rewrite includes to not need so much -Ifoo

Current strategy: everything from the top

Things to look at first are the manual changes:

   - added tools/rewrite_includes.py
   - removed -Idirectives from BUILD.gn
   - various compile.sh simplifications
   - tweak tools/embed_resources.py
   - update gn/find_headers.py to write paths from the top
   - update gn/gn_to_bp.py SkUserConfig.h layout
     so that #include "include/config/SkUserConfig.h" always
     gets the header we want.

No-Presubmit: true
Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

gm/colorfilterimagefilter.cpp

diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index dca6486..38797a0 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "gm.h"
-#include "SkCanvas.h"
-#include "SkColorMatrixFilter.h"
-#include "SkColorPriv.h"
-#include "SkShader.h"
+#include "gm/gm.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkShader.h"
+#include "include/effects/SkColorMatrixFilter.h"
 
-#include "SkBlurImageFilter.h"
-#include "SkColorFilterImageFilter.h"
-#include "SkTDArray.h"
+#include "include/effects/SkBlurImageFilter.h"
+#include "include/effects/SkColorFilterImageFilter.h"
+#include "include/private/SkTDArray.h"
 
 #define FILTER_WIDTH    SkIntToScalar(30)
 #define FILTER_HEIGHT   SkIntToScalar(30)
@@ -51,9 +51,9 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "SkGradientShader.h"
-#include "SkImage.h"
-#include "Resources.h"
+#include "include/core/SkImage.h"
+#include "include/effects/SkGradientShader.h"
+#include "tools/Resources.h"
 
 static sk_sp<SkShader> sh_make_lineargradient0() {
     const SkPoint pts[] = { { 0, 0 }, { 100, 100 } };
@@ -187,7 +187,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "SkGradientShader.h"
+#include "include/effects/SkGradientShader.h"
 
 template <typename T> class SkTRefArray : public SkTDArray<T> {
 public: