run rewrite_includes.py
Just your basic periodic cleanup.
Change-Id: I04d9ca5cfff05e6e2c29dd9caef3ce12cda45247
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219340
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/core/SkVM.h b/src/core/SkVM.h
index 662d6c8..3c4f2d4 100644
--- a/src/core/SkVM.h
+++ b/src/core/SkVM.h
@@ -8,8 +8,8 @@
#ifndef SkVM_DEFINED
#define SkVM_DEFINED
-#include "include/core/SkTypes.h"
#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
#include <unordered_map>
#include <vector>
diff --git a/src/core/SkYUVMath.cpp b/src/core/SkYUVMath.cpp
index f074515..091e694 100644
--- a/src/core/SkYUVMath.cpp
+++ b/src/core/SkYUVMath.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkYUVMath.h"
#include "include/core/SkMatrix44.h"
+#include "src/core/SkYUVMath.h"
// in SkColorMatrix order (row-major)
// Created by running SkColorMatrix_DumpYUVMatrixTables()
diff --git a/src/gpu/GrContextPriv.cpp b/src/gpu/GrContextPriv.cpp
index a311de0..093acbf 100644
--- a/src/gpu/GrContextPriv.cpp
+++ b/src/gpu/GrContextPriv.cpp
@@ -15,8 +15,8 @@
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrRenderTargetContext.h"
-#include "src/gpu/GrSurfacePriv.h"
#include "src/gpu/GrSurfaceContextPriv.h"
+#include "src/gpu/GrSurfacePriv.h"
#include "src/gpu/GrTextureContext.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/generated/GrConfigConversionEffect.h"
diff --git a/src/gpu/GrDataUtils.cpp b/src/gpu/GrDataUtils.cpp
index b835245..965251e 100644
--- a/src/gpu/GrDataUtils.cpp
+++ b/src/gpu/GrDataUtils.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "GrDataUtils.h"
+#include "src/gpu/GrDataUtils.h"
#include "include/private/GrColor.h"
#include "src/core/SkUtils.h"
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 56e38c5..4c89936 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "src/gpu/GrRenderTargetContext.h"
#include "include/core/SkDrawable.h"
#include "include/gpu/GrBackendSemaphore.h"
#include "include/gpu/GrRenderTarget.h"
@@ -33,6 +32,7 @@
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrPathRenderer.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrStencilAttachment.h"
diff --git a/src/gpu/gl/GrGLTypesPriv.cpp b/src/gpu/gl/GrGLTypesPriv.cpp
index debb408..8c66fa5 100644
--- a/src/gpu/gl/GrGLTypesPriv.cpp
+++ b/src/gpu/gl/GrGLTypesPriv.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/GrGLTypesPriv.h"
#include "include/core/SkScalar.h"
+#include "include/private/GrGLTypesPriv.h"
#include "src/gpu/GrSwizzle.h"
#include "src/gpu/gl/GrGLDefines.h"
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h
index 4aafaeb..7eb1157 100644
--- a/src/sksl/SkSLIRGenerator.h
+++ b/src/sksl/SkSLIRGenerator.h
@@ -8,9 +8,9 @@
#ifndef SKSL_IRGENERATOR
#define SKSL_IRGENERATOR
-#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLASTFile.h"
#include "src/sksl/SkSLASTNode.h"
+#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/ir/SkSLBlock.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLExtension.h"
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index d260f0a..c7af062 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -6,8 +6,8 @@
*/
#include "stdio.h"
-#include "src/sksl/SkSLParser.h"
#include "src/sksl/SkSLASTNode.h"
+#include "src/sksl/SkSLParser.h"
#include "src/sksl/ir/SkSLModifiers.h"
#include "src/sksl/ir/SkSLSymbolTable.h"
#include "src/sksl/ir/SkSLType.h"
diff --git a/src/sksl/SkSLParser.h b/src/sksl/SkSLParser.h
index a9eaa49..d67f72d 100644
--- a/src/sksl/SkSLParser.h
+++ b/src/sksl/SkSLParser.h
@@ -13,9 +13,9 @@
#include <unordered_map>
#include <unordered_set>
#include "src/sksl/SkSLASTFile.h"
+#include "src/sksl/SkSLASTNode.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLLexer.h"
-#include "src/sksl/SkSLASTNode.h"
#include "src/sksl/ir/SkSLLayout.h"
struct yy_buffer_state;
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h
index 5fd7e38..aff2e7f 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/SkSLSPIRVCodeGenerator.h
@@ -14,6 +14,7 @@
#include "src/sksl/SkSLCodeGenerator.h"
#include "src/sksl/SkSLMemoryLayout.h"
+#include "src/sksl/SkSLStringStream.h"
#include "src/sksl/ir/SkSLBinaryExpression.h"
#include "src/sksl/ir/SkSLBoolLiteral.h"
#include "src/sksl/ir/SkSLConstructor.h"
@@ -40,7 +41,6 @@
#include "src/sksl/ir/SkSLVarDeclarationsStatement.h"
#include "src/sksl/ir/SkSLVariableReference.h"
#include "src/sksl/ir/SkSLWhileStatement.h"
-#include "src/sksl/SkSLStringStream.h"
#include "src/sksl/spirv.h"
union ConstantValue {
diff --git a/src/sksl/SkSLString.h b/src/sksl/SkSLString.h
index 091634d..c3c799c 100644
--- a/src/sksl/SkSLString.h
+++ b/src/sksl/SkSLString.h
@@ -22,7 +22,7 @@
#include "include/core/SkString.h"
#endif
-#include "SkSLUtil.h"
+#include "src/sksl/SkSLUtil.h"
namespace SkSL {
diff --git a/src/sksl/SkSLUtil.cpp b/src/sksl/SkSLUtil.cpp
index e8b2d1b..ed6d485 100644
--- a/src/sksl/SkSLUtil.cpp
+++ b/src/sksl/SkSLUtil.cpp
@@ -7,7 +7,7 @@
#include "src/sksl/SkSLUtil.h"
-#include "SkSLStringStream.h"
+#include "src/sksl/SkSLStringStream.h"
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS