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>

modules/particles/src/SkCurve.cpp

diff --git a/modules/particles/src/SkCurve.cpp b/modules/particles/src/SkCurve.cpp
index 5dcfb60d..dbd754b 100644
--- a/modules/particles/src/SkCurve.cpp
+++ b/modules/particles/src/SkCurve.cpp
@@ -5,11 +5,11 @@
 * found in the LICENSE file.
 */
 
-#include "SkCurve.h"
+#include "modules/particles/include/SkCurve.h"
 
-#include "SkParticleData.h"
-#include "SkRandom.h"
-#include "SkReflected.h"
+#include "include/utils/SkRandom.h"
+#include "modules/particles/include/SkParticleData.h"
+#include "modules/particles/include/SkReflected.h"
 
 constexpr SkFieldVisitor::EnumStringMapping gCurveSegmentTypeMapping[] = {
     { kConstant_SegmentType, "Constant" },

modules/particles/src/SkParticleAffector.cpp

diff --git a/modules/particles/src/SkParticleAffector.cpp b/modules/particles/src/SkParticleAffector.cpp
index 82ea43f..80094ff 100644
--- a/modules/particles/src/SkParticleAffector.cpp
+++ b/modules/particles/src/SkParticleAffector.cpp
@@ -5,15 +5,15 @@
 * found in the LICENSE file.
 */
 
-#include "SkParticleAffector.h"
+#include "modules/particles/include/SkParticleAffector.h"
 
-#include "SkContourMeasure.h"
-#include "SkCurve.h"
-#include "SkParsePath.h"
-#include "SkParticleData.h"
-#include "SkPath.h"
-#include "SkRandom.h"
-#include "SkTextUtils.h"
+#include "include/core/SkContourMeasure.h"
+#include "include/core/SkPath.h"
+#include "include/utils/SkParsePath.h"
+#include "include/utils/SkRandom.h"
+#include "include/utils/SkTextUtils.h"
+#include "modules/particles/include/SkCurve.h"
+#include "modules/particles/include/SkParticleData.h"
 
 
 void SkParticleAffector::apply(const SkParticleUpdateParams& params,

modules/particles/src/SkParticleDrawable.cpp

diff --git a/modules/particles/src/SkParticleDrawable.cpp b/modules/particles/src/SkParticleDrawable.cpp
index 9c31cc0..4f942b2 100644
--- a/modules/particles/src/SkParticleDrawable.cpp
+++ b/modules/particles/src/SkParticleDrawable.cpp
@@ -5,17 +5,17 @@
 * found in the LICENSE file.
 */
 
-#include "SkParticleDrawable.h"
+#include "modules/particles/include/SkParticleDrawable.h"
 
-#include "SkAutoMalloc.h"
-#include "SkCanvas.h"
-#include "SkImage.h"
-#include "SkPaint.h"
-#include "SkParticleData.h"
-#include "SkRect.h"
-#include "SkSurface.h"
-#include "SkString.h"
-#include "SkRSXform.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRSXform.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkString.h"
+#include "include/core/SkSurface.h"
+#include "modules/particles/include/SkParticleData.h"
+#include "src/core/SkAutoMalloc.h"
 
 static sk_sp<SkImage> make_circle_image(int radius) {
     auto surface = SkSurface::MakeRasterN32Premul(radius * 2, radius * 2);

modules/particles/src/SkParticleEffect.cpp

diff --git a/modules/particles/src/SkParticleEffect.cpp b/modules/particles/src/SkParticleEffect.cpp
index 1cd0eab..1e79a5f 100644
--- a/modules/particles/src/SkParticleEffect.cpp
+++ b/modules/particles/src/SkParticleEffect.cpp
@@ -5,15 +5,15 @@
 * found in the LICENSE file.
 */
 
-#include "SkParticleEffect.h"
+#include "modules/particles/include/SkParticleEffect.h"
 
-#include "SkCanvas.h"
-#include "SkColorData.h"
-#include "SkPaint.h"
-#include "SkParticleAffector.h"
-#include "SkParticleDrawable.h"
-#include "SkReflected.h"
-#include "SkRSXform.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRSXform.h"
+#include "include/private/SkColorData.h"
+#include "modules/particles/include/SkParticleAffector.h"
+#include "modules/particles/include/SkParticleDrawable.h"
+#include "modules/particles/include/SkReflected.h"
 
 void SkParticleEffectParams::visitFields(SkFieldVisitor* v) {
     v->visit("MaxCount", fMaxCount);

modules/particles/src/SkReflected.cpp

diff --git a/modules/particles/src/SkReflected.cpp b/modules/particles/src/SkReflected.cpp
index 938bb87..94e59ca 100644
--- a/modules/particles/src/SkReflected.cpp
+++ b/modules/particles/src/SkReflected.cpp
@@ -5,9 +5,9 @@
 * found in the LICENSE file.
 */
 
-#include "SkReflected.h"
+#include "modules/particles/include/SkReflected.h"
 
-#include "SkCurve.h"
+#include "modules/particles/include/SkCurve.h"
 
 SkSTArray<16, const SkReflected::Type*, true> SkReflected::gTypes;