Fixup build/include_order issues in src/dawn.

This Cl moves the cpp includes to above the project includes fixing up
the build/include_order issues and enabling the lint check.

A couple includes are marked as NOLINT as the c header has to come after
the project header due to setting defines.

Bug: dawn:1339
Change-Id: Ia47499c94fff99106397b83f6c5c7fe100c44a0e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86513
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>

src/dawn/CPPLINT.cfg

@@ -1,4 +1,3 @@
-filter=-build/include_order
 filter=-build/include_what_you_use
 filter=-build/namespaces
 filter=-readability/casting

src/dawn/common/Assert.cpp

@@ -13,10 +13,11 @@
 // limitations under the License.
 
 #include "dawn/common/Assert.h"
-#include "dawn/common/Log.h"
 
 #include <cstdlib>
 
+#include "dawn/common/Log.h"
+
 void HandleAssertionFailure(const char* file,
                             const char* function,
                             int line,

src/dawn/common/BitSetIterator.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_COMMON_BITSETITERATOR_H_
 #define SRC_DAWN_COMMON_BITSETITERATOR_H_
 
+#include <bitset>
+#include <limits>
+
 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
 #include "dawn/common/UnderlyingType.h"
 
-#include <bitset>
-#include <limits>
-
 // This is ANGLE's BitSetIterator class with a customizable return type
 // TODO(crbug.com/dawn/306): it could be optimized, in particular when N <= 64
 

src/dawn/common/ConcurrentCache.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_COMMON_CONCURRENTCACHE_H_
 #define SRC_DAWN_COMMON_CONCURRENTCACHE_H_
 
-#include "dawn/common/NonCopyable.h"
-
 #include <mutex>
 #include <unordered_set>
 #include <utility>
 
+#include "dawn/common/NonCopyable.h"
+
 template <typename T>
 class ConcurrentCache : public NonMovable {
   public:

src/dawn/common/CoreFoundationRef.h

@@ -15,10 +15,10 @@
 #ifndef SRC_DAWN_COMMON_COREFOUNDATIONREF_H_
 #define SRC_DAWN_COMMON_COREFOUNDATIONREF_H_
 
-#include "dawn/common/RefBase.h"
-
 #include <CoreFoundation/CoreFoundation.h>
 
+#include "dawn/common/RefBase.h"
+
 template <typename T>
 struct CoreFoundationRefTraits {
     static constexpr T kNullValue = nullptr;

src/dawn/common/DynamicLib.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_COMMON_DYNAMICLIB_H_
 #define SRC_DAWN_COMMON_DYNAMICLIB_H_
 
-#include "dawn/common/Assert.h"
-
 #include <string>
 #include <type_traits>
 
+#include "dawn/common/Assert.h"
+
 class DynamicLib {
   public:
     DynamicLib() = default;

src/dawn/common/GPUInfo.cpp

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <algorithm>
+#include <array>
+
 #include "dawn/common/GPUInfo.h"
 
 #include "dawn/common/Assert.h"
 
-#include <algorithm>
-#include <array>
-
 namespace gpu_info {
     namespace {
         // Intel

src/dawn/common/HashUtils.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_COMMON_HASHUTILS_H_
 #define SRC_DAWN_COMMON_HASHUTILS_H_
 
+#include <bitset>
+#include <functional>
+
 #include "dawn/common/Platform.h"
 #include "dawn/common/TypedInteger.h"
 #include "dawn/common/ityp_bitset.h"
 
-#include <bitset>
-#include <functional>
-
 // Wrapper around std::hash to make it a templated function instead of a functor. It is marginally
 // nicer, and avoids adding to the std namespace to add hashing of other types.
 template <typename T>

src/dawn/common/IOKitRef.h

@@ -15,10 +15,10 @@
 #ifndef SRC_DAWN_COMMON_IOKITREF_H_
 #define SRC_DAWN_COMMON_IOKITREF_H_
 
-#include "dawn/common/RefBase.h"
-
 #include <IOKit/IOKitLib.h>
 
+#include "dawn/common/RefBase.h"
+
 template <typename T>
 struct IOKitRefTraits {
     static constexpr T kNullValue = IO_OBJECT_NULL;

src/dawn/common/Log.cpp

@@ -14,11 +14,11 @@
 
 #include "dawn/common/Log.h"
 
+#include <cstdio>
+
 #include "dawn/common/Assert.h"
 #include "dawn/common/Platform.h"
 
-#include <cstdio>
-
 #if defined(DAWN_PLATFORM_ANDROID)
 #    include <android/log.h>
 #endif

src/dawn/common/Math.cpp

@@ -14,13 +14,13 @@
 
 #include "dawn/common/Math.h"
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/Platform.h"
-
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
+
 #if defined(DAWN_COMPILER_MSVC)
 #    include <intrin.h>
 #endif

src/dawn/common/Math.h

@@ -15,8 +15,6 @@
 #ifndef SRC_DAWN_COMMON_MATH_H_
 #define SRC_DAWN_COMMON_MATH_H_
 
-#include "dawn/common/Assert.h"
-
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
@@ -24,6 +22,8 @@
 #include <limits>
 #include <type_traits>
 
+#include "dawn/common/Assert.h"
+
 // The following are not valid for 0
 uint32_t ScanForward(uint32_t bits);
 uint32_t Log2(uint32_t value);

src/dawn/common/RefBase.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_COMMON_REFBASE_H_
 #define SRC_DAWN_COMMON_REFBASE_H_
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/Compiler.h"
-
 #include <type_traits>
 #include <utility>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
+
 // A common class for various smart-pointers acting on referenceable/releasable pointer-like
 // objects. Logic for each specialization can be customized using a Traits type that looks
 // like the following:

src/dawn/common/RefCounted.cpp

@@ -14,10 +14,10 @@
 
 #include "dawn/common/RefCounted.h"
 
-#include "dawn/common/Assert.h"
-
 #include <cstddef>
 
+#include "dawn/common/Assert.h"
+
 static constexpr size_t kPayloadBits = 1;
 static constexpr uint64_t kPayloadMask = (uint64_t(1) << kPayloadBits) - 1;
 static constexpr uint64_t kRefCountIncrement = (uint64_t(1) << kPayloadBits);

src/dawn/common/RefCounted.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_COMMON_REFCOUNTED_H_
 #define SRC_DAWN_COMMON_REFCOUNTED_H_
 
-#include "dawn/common/RefBase.h"
-
 #include <atomic>
 #include <cstdint>
 
+#include "dawn/common/RefBase.h"
+
 class RefCounted {
   public:
     explicit RefCounted(uint64_t payload = 0);

src/dawn/common/Result.h

@@ -15,15 +15,15 @@
 #ifndef SRC_DAWN_COMMON_RESULT_H_
 #define SRC_DAWN_COMMON_RESULT_H_
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/Compiler.h"
-
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <type_traits>
 #include <utility>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
+
 // Result<T, E> is the following sum type (Haskell notation):
 //
 //      data Result T E = Success T | Error E | Empty

src/dawn/common/SerialMap.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_COMMON_SERIALMAP_H_
 #define SRC_DAWN_COMMON_SERIALMAP_H_
 
-#include "dawn/common/SerialStorage.h"
-
 #include <map>
 #include <vector>
 
+#include "dawn/common/SerialStorage.h"
+
 template <typename Serial, typename Value>
 class SerialMap;
 

src/dawn/common/SerialQueue.h

@@ -15,10 +15,10 @@
 #ifndef SRC_DAWN_COMMON_SERIALQUEUE_H_
 #define SRC_DAWN_COMMON_SERIALQUEUE_H_
 
-#include "dawn/common/SerialStorage.h"
-
 #include <vector>
 
+#include "dawn/common/SerialStorage.h"
+
 template <typename Serial, typename Value>
 class SerialQueue;
 

src/dawn/common/SerialStorage.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_COMMON_SERIALSTORAGE_H_
 #define SRC_DAWN_COMMON_SERIALSTORAGE_H_
 
-#include "dawn/common/Assert.h"
-
 #include <cstdint>
 #include <utility>
 
+#include "dawn/common/Assert.h"
+
 template <typename T>
 struct SerialStorageTraits {};
 

src/dawn/common/SlabAllocator.cpp

@@ -14,14 +14,14 @@
 
 #include "dawn/common/SlabAllocator.h"
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/Math.h"
-
 #include <algorithm>
 #include <cstdlib>
 #include <limits>
 #include <new>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+
 // IndexLinkNode
 
 SlabAllocatorImpl::IndexLinkNode::IndexLinkNode(Index index, Index nextIndex)

src/dawn/common/SlabAllocator.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_COMMON_SLABALLOCATOR_H_
 #define SRC_DAWN_COMMON_SLABALLOCATOR_H_
 
-#include "dawn/common/PlacementAllocated.h"
-
 #include <cstdint>
 #include <type_traits>
 #include <utility>
 
+#include "dawn/common/PlacementAllocated.h"
+
 // The SlabAllocator allocates objects out of one or more fixed-size contiguous "slabs" of memory.
 // This makes it very quick to allocate and deallocate fixed-size objects because the allocator only
 // needs to index an offset into pre-allocated memory. It is similar to a pool-allocator that

src/dawn/common/StackContainer.h

@@ -7,11 +7,11 @@
 #ifndef SRC_DAWN_COMMON_STACKCONTAINER_H_
 #define SRC_DAWN_COMMON_STACKCONTAINER_H_
 
-#include "dawn/common/Compiler.h"
-
 #include <cstddef>
 #include <vector>
 
+#include "dawn/common/Compiler.h"
+
 // This allocator can be used with STL containers to provide a stack buffer
 // from which to allocate memory and overflows onto the heap. This stack buffer
 // would be allocated on the stack and allows us to avoid heap operations in

src/dawn/common/SystemUtils.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_COMMON_SYSTEMUTILS_H_
 #define SRC_DAWN_COMMON_SYSTEMUTILS_H_
 
-#include "dawn/common/Platform.h"
-
 #include <optional>
 #include <string>
 
+#include "dawn/common/Platform.h"
+
 const char* GetPathSeparator();
 // Returns a pair of the environment variable's value, and a boolean indicating whether the variable
 // was present.

src/dawn/common/TypedInteger.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_COMMON_TYPEDINTEGER_H_
 #define SRC_DAWN_COMMON_TYPEDINTEGER_H_
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/UnderlyingType.h"
-
 #include <limits>
 #include <type_traits>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/UnderlyingType.h"
+
 // TypedInteger is helper class that provides additional type safety in Debug.
 //  - Integers of different (Tag, BaseIntegerType) may not be used interoperably
 //  - Allows casts only to the underlying type.

src/dawn/common/WindowsUtils.cpp

@@ -14,10 +14,10 @@
 
 #include "dawn/common/WindowsUtils.h"
 
-#include "dawn/common/windows_with_undefs.h"
-
 #include <memory>
 
+#include "dawn/common/windows_with_undefs.h"
+
 std::string WCharToUTF8(const wchar_t* input) {
     // The -1 argument asks WideCharToMultiByte to use the null terminator to know the size of
     // input. It will return a size that includes the null terminator.

src/dawn/common/ityp_array.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_COMMON_ITYP_ARRAY_H_
 #define SRC_DAWN_COMMON_ITYP_ARRAY_H_
 
-#include "dawn/common/TypedInteger.h"
-#include "dawn/common/UnderlyingType.h"
-
 #include <array>
 #include <cstddef>
 #include <type_traits>
 
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
+
 namespace ityp {
 
     // ityp::array is a helper class that wraps std::array with the restriction that

src/dawn/common/ityp_span.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_COMMON_ITYP_SPAN_H_
 #define SRC_DAWN_COMMON_ITYP_SPAN_H_
 
+#include <type_traits>
+
 #include "dawn/common/TypedInteger.h"
 #include "dawn/common/UnderlyingType.h"
 
-#include <type_traits>
-
 namespace ityp {
 
     // ityp::span is a helper class that wraps an unowned packed array of type |Value|.

src/dawn/common/ityp_vector.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_COMMON_ITYP_VECTOR_H_
 #define SRC_DAWN_COMMON_ITYP_VECTOR_H_
 
-#include "dawn/common/TypedInteger.h"
-#include "dawn/common/UnderlyingType.h"
-
 #include <type_traits>
 #include <vector>
 
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
+
 namespace ityp {
 
     // ityp::vector is a helper class that wraps std::vector with the restriction that

src/dawn/common/vulkan_platform.h

@@ -22,11 +22,11 @@
 #    error "vulkan.h included before vulkan_platform.h"
 #endif
 
-#include "dawn/common/Platform.h"
-
 #include <cstddef>
 #include <cstdint>
 
+#include "dawn/common/Platform.h"
+
 // vulkan.h defines non-dispatchable handles to opaque pointers on 64bit architectures and uint64_t
 // on 32bit architectures. This causes a problem in 32bit where the handles cannot be used to
 // distinguish between overloads of the same function.

src/dawn/fuzzers/DawnWireServerFuzzer.cpp

@@ -14,6 +14,9 @@
 
 #include "dawn/fuzzers/DawnWireServerFuzzer.h"
 
+#include <fstream>
+#include <vector>
+
 #include "dawn/common/Assert.h"
 #include "dawn/common/Log.h"
 #include "dawn/common/SystemUtils.h"
@@ -23,9 +26,6 @@
 #include "dawn/webgpu_cpp.h"
 #include "dawn/wire/WireServer.h"
 
-#include <fstream>
-#include <vector>
-
 namespace {
 
     class DevNull : public dawn::wire::CommandSerializer {

src/dawn/fuzzers/DawnWireServerFuzzer.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_
 #define SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_
 
-#include "dawn/webgpu_cpp.h"
-
 #include <cstdint>
 #include <functional>
 
+#include "dawn/webgpu_cpp.h"
+
 namespace dawn::native {
 
     class Instance;

src/dawn/native/Adapter.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_ADAPTER_H_
 #define SRC_DAWN_NATIVE_ADAPTER_H_
 
+#include <string>
+
 #include "dawn/native/DawnNative.h"
 
 #include "dawn/common/RefCounted.h"
@@ -24,8 +26,6 @@
 #include "dawn/native/Limits.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <string>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/AttachmentState.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_ATTACHMENTSTATE_H_
 #define SRC_DAWN_NATIVE_ATTACHMENTSTATE_H_
 
+#include <array>
+#include <bitset>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/common/ityp_bitset.h"
@@ -24,9 +27,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-#include <bitset>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/BackendConnection.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_BACKENDCONNECTION_H_
 #define SRC_DAWN_NATIVE_BACKENDCONNECTION_H_
 
+#include <memory>
+
 #include "dawn/native/Adapter.h"
 #include "dawn/native/DawnNative.h"
 
-#include <memory>
-
 namespace dawn::native {
 
     // An common interface for all backends. Mostly used to create adapters for a particular

src/dawn/native/BindGroup.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_BINDGROUP_H_
 #define SRC_DAWN_NATIVE_BINDGROUP_H_
 
+#include <array>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
 #include "dawn/native/BindGroupLayout.h"
@@ -24,8 +26,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/BindGroupLayout.cpp

@@ -14,6 +14,10 @@
 
 #include "dawn/native/BindGroupLayout.h"
 
+#include <algorithm>
+#include <functional>
+#include <set>
+
 #include "dawn/common/BitSetIterator.h"
 
 #include "dawn/native/ChainUtils_autogen.h"
@@ -24,10 +28,6 @@
 #include "dawn/native/PerStage.h"
 #include "dawn/native/ValidationUtils_autogen.h"
 
-#include <algorithm>
-#include <functional>
-#include <set>
-
 namespace dawn::native {
 
     namespace {

src/dawn/native/BindGroupLayout.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_BINDGROUPLAYOUT_H_
 #define SRC_DAWN_NATIVE_BINDGROUPLAYOUT_H_
 
+#include <bitset>
+#include <map>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
 #include "dawn/common/SlabAllocator.h"
@@ -28,9 +31,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <bitset>
-#include <map>
-
 namespace dawn::native {
     // TODO(dawn:1082): Minor optimization to use BindingIndex instead of BindingNumber
     struct ExternalTextureBindingExpansion {

src/dawn/native/BindGroupTracker.h

@@ -15,14 +15,14 @@
 #ifndef SRC_DAWN_NATIVE_BINDGROUPTRACKER_H_
 #define SRC_DAWN_NATIVE_BINDGROUPTRACKER_H_
 
+#include <array>
+#include <bitset>
+
 #include "dawn/common/Constants.h"
 #include "dawn/native/BindGroupLayout.h"
 #include "dawn/native/Pipeline.h"
 #include "dawn/native/PipelineLayout.h"
 
-#include <array>
-#include <bitset>
-
 namespace dawn::native {
 
     // Keeps track of the dirty bind groups so they can be lazily applied when we know the

src/dawn/native/BindingInfo.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_BINDINGINFO_H_
 #define SRC_DAWN_NATIVE_BINDINGINFO_H_
 
+#include <cstdint>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/native/Error.h"
@@ -24,8 +26,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <cstdint>
-
 namespace dawn::native {
 
     // Not a real WebGPU limit, but the sum of the two limits is useful for internal optimizations.

src/dawn/native/BuddyMemoryAllocator.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_NATIVE_BUDDYMEMORYALLOCATOR_H_
 #define SRC_DAWN_NATIVE_BUDDYMEMORYALLOCATOR_H_
 
+#include <memory>
+#include <vector>
+
 #include "dawn/native/BuddyAllocator.h"
 #include "dawn/native/Error.h"
 #include "dawn/native/ResourceMemoryAllocation.h"
 
-#include <memory>
-#include <vector>
-
 namespace dawn::native {
 
     class ResourceHeapAllocator;

src/dawn/native/Buffer.cpp

@@ -14,6 +14,10 @@
 
 #include "dawn/native/Buffer.h"
 
+#include <cstdio>
+#include <cstring>
+#include <utility>
+
 #include "dawn/common/Alloc.h"
 #include "dawn/common/Assert.h"
 #include "dawn/native/Commands.h"
@@ -26,10 +30,6 @@
 #include "dawn/platform/DawnPlatform.h"
 #include "dawn/platform/tracing/TraceEvent.h"
 
-#include <cstdio>
-#include <cstring>
-#include <utility>
-
 namespace dawn::native {
 
     namespace {

src/dawn/native/Buffer.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_BUFFER_H_
 #define SRC_DAWN_NATIVE_BUFFER_H_
 
+#include <memory>
+
 #include "dawn/native/Error.h"
 #include "dawn/native/Forward.h"
 #include "dawn/native/IntegerTypes.h"
@@ -22,8 +24,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <memory>
-
 namespace dawn::native {
 
     struct CopyTextureToBufferCmd;

src/dawn/native/CacheKey.h

@@ -15,9 +15,6 @@
 #ifndef SRC_DAWN_NATIVE_CACHEKEY_H_
 #define SRC_DAWN_NATIVE_CACHEKEY_H_
 
-#include "dawn/common/TypedInteger.h"
-#include "dawn/common/ityp_array.h"
-
 #include <bitset>
 #include <iostream>
 #include <limits>
@@ -25,6 +22,9 @@
 #include <type_traits>
 #include <vector>
 
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_array.h"
+
 namespace dawn::native {
 
     // Forward declare classes because of co-dependency.

src/dawn/native/CachedObject.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_CACHEDOBJECT_H_
 #define SRC_DAWN_NATIVE_CACHEDOBJECT_H_
 
-#include "dawn/native/CacheKey.h"
-#include "dawn/native/Forward.h"
-
 #include <cstddef>
 #include <string>
 
+#include "dawn/native/CacheKey.h"
+#include "dawn/native/Forward.h"
+
 namespace dawn::native {
 
     // Some objects are cached so that instead of creating new duplicate objects,

src/dawn/native/CommandAllocator.cpp

@@ -14,14 +14,14 @@
 
 #include "dawn/native/CommandAllocator.h"
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/Math.h"
-
 #include <algorithm>
 #include <climits>
 #include <cstdlib>
 #include <utility>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+
 namespace dawn::native {
 
     // TODO(cwallez@chromium.org): figure out a way to have more type safety for the iterator

src/dawn/native/CommandAllocator.h

@@ -15,14 +15,14 @@
 #ifndef SRC_DAWN_NATIVE_COMMANDALLOCATOR_H_
 #define SRC_DAWN_NATIVE_COMMANDALLOCATOR_H_
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/Math.h"
-#include "dawn/common/NonCopyable.h"
-
 #include <cstddef>
 #include <cstdint>
 #include <vector>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/NonCopyable.h"
+
 namespace dawn::native {
 
     // Allocation for command buffers should be fast. To avoid doing an allocation per command

src/dawn/native/CommandEncoder.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_COMMANDENCODER_H_
 #define SRC_DAWN_NATIVE_COMMANDENCODER_H_
 
+#include <string>
+
 #include "dawn/native/dawn_platform.h"
 
 #include "dawn/native/EncodingContext.h"
@@ -22,8 +24,6 @@
 #include "dawn/native/ObjectBase.h"
 #include "dawn/native/PassResourceUsage.h"
 
-#include <string>
-
 namespace dawn::native {
 
     enum class UsageValidationMode;

src/dawn/native/CommandValidation.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_COMMANDVALIDATION_H_
 #define SRC_DAWN_NATIVE_COMMANDVALIDATION_H_
 
+#include <vector>
+
 #include "dawn/native/CommandAllocator.h"
 #include "dawn/native/Error.h"
 #include "dawn/native/Texture.h"
 
-#include <vector>
-
 namespace dawn::native {
 
     class QuerySetBase;

src/dawn/native/Commands.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_COMMANDS_H_
 #define SRC_DAWN_NATIVE_COMMANDS_H_
 
+#include <array>
+#include <bitset>
+
 #include "dawn/common/Constants.h"
 
 #include "dawn/native/AttachmentState.h"
@@ -23,9 +26,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-#include <bitset>
-
 namespace dawn::native {
 
     // Definition of the commands that are present in the CommandIterator given by the

src/dawn/native/CompilationMessages.cpp

@@ -17,7 +17,7 @@
 #include "dawn/common/Assert.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <tint/tint.h>
+#include "tint/tint.h"
 
 namespace dawn::native {
 

src/dawn/native/CompilationMessages.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_NATIVE_COMPILATIONMESSAGES_H_
 #define SRC_DAWN_NATIVE_COMPILATIONMESSAGES_H_
 
+#include <string>
+#include <vector>
+
 #include "dawn/native/dawn_platform.h"
 
 #include "dawn/common/NonCopyable.h"
 
-#include <string>
-#include <vector>
-
 namespace tint::diag {
     class Diagnostic;
     class List;

src/dawn/native/CopyTextureForBrowserHelper.cpp

@@ -14,6 +14,8 @@
 
 #include "dawn/native/CopyTextureForBrowserHelper.h"
 
+#include <unordered_set>
+
 #include "dawn/common/Log.h"
 #include "dawn/native/BindGroup.h"
 #include "dawn/native/BindGroupLayout.h"
@@ -31,8 +33,6 @@
 #include "dawn/native/ValidationUtils_autogen.h"
 #include "dawn/native/utils/WGPUHelpers.h"
 
-#include <unordered_set>
-
 namespace dawn::native {
     namespace {
 

src/dawn/native/Device.cpp

@@ -14,6 +14,10 @@
 
 #include "dawn/native/Device.h"
 
+#include <array>
+#include <mutex>
+#include <unordered_set>
+
 #include "dawn/common/Log.h"
 #include "dawn/native/Adapter.h"
 #include "dawn/native/AsyncTask.h"
@@ -48,10 +52,6 @@
 #include "dawn/platform/DawnPlatform.h"
 #include "dawn/platform/tracing/TraceEvent.h"
 
-#include <array>
-#include <mutex>
-#include <unordered_set>
-
 namespace dawn::native {
 
     // DeviceBase sub-structures

src/dawn/native/Device.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_DEVICE_H_
 #define SRC_DAWN_NATIVE_DEVICE_H_
 
+#include <mutex>
+#include <utility>
+
 #include "dawn/native/CacheKey.h"
 #include "dawn/native/Commands.h"
 #include "dawn/native/ComputePipeline.h"
@@ -31,9 +34,6 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <mutex>
-#include <utility>
-
 namespace dawn::platform {
     class WorkerTaskPool;
 }  // namespace dawn::platform

src/dawn/native/EncodingContext.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_ENCODINGCONTEXT_H_
 #define SRC_DAWN_NATIVE_ENCODINGCONTEXT_H_
 
+#include <string>
+
 #include "dawn/native/CommandAllocator.h"
 #include "dawn/native/Error.h"
 #include "dawn/native/ErrorData.h"
@@ -22,8 +24,6 @@
 #include "dawn/native/PassResourceUsageTracker.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <string>
-
 namespace dawn::native {
 
     class CommandEncoder;

src/dawn/native/Error.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_NATIVE_ERROR_H_
 #define SRC_DAWN_NATIVE_ERROR_H_
 
+#include <string>
+
 #include "absl/strings/str_format.h"
 #include "dawn/common/Result.h"
 #include "dawn/native/ErrorData.h"
 #include "dawn/native/webgpu_absl_format.h"
 
-#include <string>
-
 namespace dawn::native {
 
     enum class InternalErrorType : uint32_t { Validation, DeviceLost, Internal, OutOfMemory };

src/dawn/native/ErrorData.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_NATIVE_ERRORDATA_H_
 #define SRC_DAWN_NATIVE_ERRORDATA_H_
 
-#include "dawn/common/Compiler.h"
-
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "dawn/common/Compiler.h"
+
 namespace wgpu {
     enum class ErrorType : uint32_t;
 }

src/dawn/native/ErrorScope.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_ERRORSCOPE_H_
 #define SRC_DAWN_NATIVE_ERRORSCOPE_H_
 
-#include "dawn/native/dawn_platform.h"
-
 #include <string>
 #include <vector>
 
+#include "dawn/native/dawn_platform.h"
+
 namespace dawn::native {
 
     class ErrorScope {

src/dawn/native/ExternalTexture.h

@@ -15,13 +15,13 @@
 #ifndef SRC_DAWN_NATIVE_EXTERNALTEXTURE_H_
 #define SRC_DAWN_NATIVE_EXTERNALTEXTURE_H_
 
+#include <array>
+
 #include "dawn/native/Error.h"
 #include "dawn/native/Forward.h"
 #include "dawn/native/ObjectBase.h"
 #include "dawn/native/Subresource.h"
 
-#include <array>
-
 namespace dawn::native {
 
     class TextureViewBase;

src/dawn/native/Format.cpp

@@ -14,13 +14,13 @@
 
 #include "dawn/native/Format.h"
 
+#include <bitset>
+
 #include "dawn/native/Device.h"
 #include "dawn/native/EnumMaskIterator.h"
 #include "dawn/native/Features.h"
 #include "dawn/native/Texture.h"
 
-#include <bitset>
-
 namespace dawn::native {
 
     // Format

src/dawn/native/Format.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_FORMAT_H_
 #define SRC_DAWN_NATIVE_FORMAT_H_
 
+#include <array>
+
 #include "dawn/native/dawn_platform.h"
 
 #include "dawn/common/TypedInteger.h"
@@ -24,8 +26,6 @@
 #include "dawn/native/Error.h"
 #include "dawn/native/Subresource.h"
 
-#include <array>
-
 // About multi-planar formats.
 //
 // Dawn supports additional multi-planar formats when the multiplanar-formats extension is enabled.

src/dawn/native/IndirectDrawMetadata.cpp

@@ -14,15 +14,15 @@
 
 #include "dawn/native/IndirectDrawMetadata.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/RefCounted.h"
 #include "dawn/native/IndirectDrawValidationEncoder.h"
 #include "dawn/native/Limits.h"
 #include "dawn/native/RenderBundle.h"
 
-#include <algorithm>
-#include <utility>
-
 namespace dawn::native {
 
     uint64_t ComputeMaxIndirectValidationBatchOffsetRange(const CombinedLimits& limits) {

src/dawn/native/IndirectDrawMetadata.h

@@ -15,18 +15,18 @@
 #ifndef SRC_DAWN_NATIVE_INDIRECTDRAWMETADATA_H_
 #define SRC_DAWN_NATIVE_INDIRECTDRAWMETADATA_H_
 
-#include "dawn/common/NonCopyable.h"
-#include "dawn/common/RefCounted.h"
-#include "dawn/native/Buffer.h"
-#include "dawn/native/CommandBufferStateTracker.h"
-#include "dawn/native/Commands.h"
-
 #include <cstdint>
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
+#include "dawn/common/NonCopyable.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/native/Buffer.h"
+#include "dawn/native/CommandBufferStateTracker.h"
+#include "dawn/native/Commands.h"
+
 namespace dawn::native {
 
     class RenderBundleBase;

src/dawn/native/IndirectDrawValidationEncoder.cpp

@@ -14,6 +14,9 @@
 
 #include "dawn/native/IndirectDrawValidationEncoder.h"
 
+#include <cstdlib>
+#include <limits>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
 #include "dawn/native/BindGroup.h"
@@ -26,9 +29,6 @@
 #include "dawn/native/Queue.h"
 #include "dawn/native/utils/WGPUHelpers.h"
 
-#include <cstdlib>
-#include <limits>
-
 namespace dawn::native {
 
     namespace {

src/dawn/native/Instance.h

@@ -15,6 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_INSTANCE_H_
 #define SRC_DAWN_NATIVE_INSTANCE_H_
 
+#include <array>
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
 #include "dawn/common/RefCounted.h"
 #include "dawn/common/ityp_bitset.h"
 #include "dawn/native/Adapter.h"
@@ -23,11 +28,6 @@
 #include "dawn/native/Toggles.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
 namespace dawn::platform {
     class Platform;
 }  // namespace dawn::platform

src/dawn/native/IntegerTypes.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_INTEGERTYPES_H_
 #define SRC_DAWN_NATIVE_INTEGERTYPES_H_
 
+#include <cstdint>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/TypedInteger.h"
 
-#include <cstdint>
-
 namespace dawn::native {
     // Binding numbers in the shader and BindGroup/BindGroupLayoutDescriptors
     using BindingNumber = TypedInteger<struct BindingNumberT, uint32_t>;

src/dawn/native/InternalPipelineStore.cpp

@@ -14,13 +14,13 @@
 
 #include "dawn/native/InternalPipelineStore.h"
 
+#include <unordered_map>
+
 #include "dawn/native/ComputePipeline.h"
 #include "dawn/native/Device.h"
 #include "dawn/native/RenderPipeline.h"
 #include "dawn/native/ShaderModule.h"
 
-#include <unordered_map>
-
 namespace dawn::native {
 
     class RenderPipelineBase;

src/dawn/native/InternalPipelineStore.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_INTERNALPIPELINESTORE_H_
 #define SRC_DAWN_NATIVE_INTERNALPIPELINESTORE_H_
 
+#include <unordered_map>
+
 #include "dawn/native/ObjectBase.h"
 #include "dawn/native/ScratchBuffer.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <unordered_map>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/Limits.cpp

@@ -14,11 +14,11 @@
 
 #include "dawn/native/Limits.h"
 
+#include <array>
+
 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
 
-#include <array>
-
 // clang-format off
 // TODO(crbug.com/dawn/685):
 // For now, only expose these tiers until metrics can determine better ones.

src/dawn/native/ObjectBase.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <mutex>
+
 #include "dawn/native/ObjectBase.h"
 #include "dawn/native/Device.h"
 
-#include <mutex>
-
 namespace dawn::native {
 
     static constexpr uint64_t kErrorPayload = 0;

src/dawn/native/ObjectBase.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_OBJECTBASE_H_
 #define SRC_DAWN_NATIVE_OBJECTBASE_H_
 
+#include <string>
+
 #include "dawn/common/LinkedList.h"
 #include "dawn/common/RefCounted.h"
 #include "dawn/native/Forward.h"
 
-#include <string>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/ObjectContentHasher.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_OBJECTCONTENTHASHER_H_
 #define SRC_DAWN_NATIVE_OBJECTCONTENTHASHER_H_
 
-#include "dawn/common/HashUtils.h"
-
 #include <string>
 #include <vector>
 
+#include "dawn/common/HashUtils.h"
+
 namespace dawn::native {
 
     // ObjectContentHasher records a hash that can be used as a key to lookup a cached object in a

src/dawn/native/PassResourceUsage.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_PASSRESOURCEUSAGE_H_
 #define SRC_DAWN_NATIVE_PASSRESOURCEUSAGE_H_
 
-#include "dawn/native/SubresourceStorage.h"
-#include "dawn/native/dawn_platform.h"
-
 #include <set>
 #include <vector>
 
+#include "dawn/native/SubresourceStorage.h"
+#include "dawn/native/dawn_platform.h"
+
 namespace dawn::native {
 
     // This file declares various "ResourceUsage" structures. They are produced by the frontend

src/dawn/native/PassResourceUsageTracker.cpp

@@ -14,6 +14,8 @@
 
 #include "dawn/native/PassResourceUsageTracker.h"
 
+#include <utility>
+
 #include "dawn/native/BindGroup.h"
 #include "dawn/native/Buffer.h"
 #include "dawn/native/EnumMaskIterator.h"
@@ -22,8 +24,6 @@
 #include "dawn/native/QuerySet.h"
 #include "dawn/native/Texture.h"
 
-#include <utility>
-
 namespace dawn::native {
 
     void SyncScopeUsageTracker::BufferUsedAs(BufferBase* buffer, wgpu::BufferUsage usage) {

src/dawn/native/PassResourceUsageTracker.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_PASSRESOURCEUSAGETRACKER_H_
 #define SRC_DAWN_NATIVE_PASSRESOURCEUSAGETRACKER_H_
 
+#include <map>
+
 #include "dawn/native/PassResourceUsage.h"
 
 #include "dawn/native/dawn_platform.h"
 
-#include <map>
-
 namespace dawn::native {
 
     class BindGroupBase;

src/dawn/native/PerStage.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_PERSTAGE_H_
 #define SRC_DAWN_NATIVE_PERSTAGE_H_
 
+#include <array>
+
 #include "dawn/common/Assert.h"
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/Constants.h"
@@ -22,8 +24,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-
 namespace dawn::native {
 
     enum class SingleShaderStage { Vertex, Fragment, Compute };

src/dawn/native/PersistentCache.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_PERSISTENTCACHE_H_
 #define SRC_DAWN_NATIVE_PERSISTENTCACHE_H_
 
-#include "dawn/native/Error.h"
-
 #include <mutex>
 #include <vector>
 
+#include "dawn/native/Error.h"
+
 namespace dawn::platform {
     class CachingInterface;
 }

src/dawn/native/Pipeline.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_PIPELINE_H_
 #define SRC_DAWN_NATIVE_PIPELINE_H_
 
+#include <array>
+#include <bitset>
+
 #include "dawn/native/CachedObject.h"
 #include "dawn/native/Forward.h"
 #include "dawn/native/ObjectBase.h"
@@ -24,9 +27,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-#include <bitset>
-
 namespace dawn::native {
 
     MaybeError ValidateProgrammableStage(DeviceBase* device,

src/dawn/native/PipelineLayout.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_PIPELINELAYOUT_H_
 #define SRC_DAWN_NATIVE_PIPELINELAYOUT_H_
 
+#include <array>
+#include <bitset>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/common/ityp_bitset.h"
@@ -26,9 +29,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-#include <bitset>
-
 namespace dawn::native {
 
     MaybeError ValidatePipelineLayoutDescriptor(

src/dawn/native/PooledResourceMemoryAllocator.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_POOLEDRESOURCEMEMORYALLOCATOR_H_
 #define SRC_DAWN_NATIVE_POOLEDRESOURCEMEMORYALLOCATOR_H_
 
+#include <deque>
+
 #include "dawn/common/SerialQueue.h"
 #include "dawn/native/ResourceHeapAllocator.h"
 
-#include <deque>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/ProgrammableEncoder.cpp

@@ -14,6 +14,8 @@
 
 #include "dawn/native/ProgrammableEncoder.h"
 
+#include <cstring>
+
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/native/BindGroup.h"
@@ -24,8 +26,6 @@
 #include "dawn/native/ObjectType_autogen.h"
 #include "dawn/native/ValidationUtils_autogen.h"
 
-#include <cstring>
-
 namespace dawn::native {
 
     ProgrammableEncoder::ProgrammableEncoder(DeviceBase* device,

src/dawn/native/QueryHelper.cpp

@@ -14,6 +14,8 @@
 
 #include "dawn/native/QueryHelper.h"
 
+#include <cmath>
+
 #include "dawn/native/BindGroup.h"
 #include "dawn/native/BindGroupLayout.h"
 #include "dawn/native/Buffer.h"
@@ -24,8 +26,6 @@
 #include "dawn/native/InternalPipelineStore.h"
 #include "dawn/native/utils/WGPUHelpers.h"
 
-#include <cmath>
-
 namespace dawn::native {
 
     namespace {

src/dawn/native/QuerySet.cpp

@@ -14,13 +14,13 @@
 
 #include "dawn/native/QuerySet.h"
 
+#include <set>
+
 #include "dawn/native/Device.h"
 #include "dawn/native/Features.h"
 #include "dawn/native/ObjectType_autogen.h"
 #include "dawn/native/ValidationUtils_autogen.h"
 
-#include <set>
-
 namespace dawn::native {
 
     namespace {

src/dawn/native/Queue.cpp

@@ -14,6 +14,8 @@
 
 #include "dawn/native/Queue.h"
 
+#include <cstring>
+
 #include "dawn/common/Constants.h"
 #include "dawn/native/Buffer.h"
 #include "dawn/native/CommandBuffer.h"
@@ -32,8 +34,6 @@
 #include "dawn/platform/DawnPlatform.h"
 #include "dawn/platform/tracing/TraceEvent.h"
 
-#include <cstring>
-
 namespace dawn::native {
 
     namespace {

src/dawn/native/RenderBundle.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_RENDERBUNDLE_H_
 #define SRC_DAWN_NATIVE_RENDERBUNDLE_H_
 
+#include <bitset>
+
 #include "dawn/common/Constants.h"
 #include "dawn/native/AttachmentState.h"
 #include "dawn/native/CommandAllocator.h"
@@ -26,8 +28,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <bitset>
-
 namespace dawn::native {
 
     struct RenderBundleDescriptor;

src/dawn/native/RenderEncoderBase.cpp

@@ -14,6 +14,9 @@
 
 #include "dawn/native/RenderEncoderBase.h"
 
+#include <math.h>
+#include <cstring>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/Log.h"
 #include "dawn/native/Buffer.h"
@@ -24,9 +27,6 @@
 #include "dawn/native/RenderPipeline.h"
 #include "dawn/native/ValidationUtils_autogen.h"
 
-#include <math.h>
-#include <cstring>
-
 namespace dawn::native {
 
     RenderEncoderBase::RenderEncoderBase(DeviceBase* device,

src/dawn/native/RenderPassEncoder.cpp

@@ -14,6 +14,9 @@
 
 #include "dawn/native/RenderPassEncoder.h"
 
+#include <math.h>
+#include <cstring>
+
 #include "dawn/common/Constants.h"
 #include "dawn/native/Buffer.h"
 #include "dawn/native/CommandEncoder.h"
@@ -25,9 +28,6 @@
 #include "dawn/native/RenderBundle.h"
 #include "dawn/native/RenderPipeline.h"
 
-#include <math.h>
-#include <cstring>
-
 namespace dawn::native {
     namespace {
 

src/dawn/native/RenderPipeline.cpp

@@ -14,6 +14,9 @@
 
 #include "dawn/native/RenderPipeline.h"
 
+#include <cmath>
+#include <sstream>
+
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/native/ChainUtils_autogen.h"
 #include "dawn/native/Commands.h"
@@ -24,9 +27,6 @@
 #include "dawn/native/ValidationUtils_autogen.h"
 #include "dawn/native/VertexFormat.h"
 
-#include <cmath>
-#include <sstream>
-
 namespace dawn::native {
 
     // Helper functions

src/dawn/native/RenderPipeline.h

@@ -15,6 +15,9 @@
 #ifndef SRC_DAWN_NATIVE_RENDERPIPELINE_H_
 #define SRC_DAWN_NATIVE_RENDERPIPELINE_H_
 
+#include <array>
+#include <bitset>
+
 #include "dawn/common/TypedInteger.h"
 #include "dawn/native/AttachmentState.h"
 #include "dawn/native/Forward.h"
@@ -23,9 +26,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <array>
-#include <bitset>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/ResourceHeapAllocator.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_RESOURCEHEAPALLOCATOR_H_
 #define SRC_DAWN_NATIVE_RESOURCEHEAPALLOCATOR_H_
 
+#include <memory>
+
 #include "dawn/native/Error.h"
 #include "dawn/native/ResourceHeap.h"
 
-#include <memory>
-
 namespace dawn::native {
 
     // Interface for backend allocators that create memory heaps resoruces can be suballocated in.

src/dawn/native/RingBufferAllocator.h

@@ -15,12 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_RINGBUFFERALLOCATOR_H_
 #define SRC_DAWN_NATIVE_RINGBUFFERALLOCATOR_H_
 
-#include "dawn/common/SerialQueue.h"
-#include "dawn/native/IntegerTypes.h"
-
 #include <limits>
 #include <memory>
 
+#include "dawn/common/SerialQueue.h"
+#include "dawn/native/IntegerTypes.h"
+
 // RingBufferAllocator is the front-end implementation used to manage a ring buffer in GPU memory.
 namespace dawn::native {
 

src/dawn/native/Sampler.cpp

@@ -14,12 +14,12 @@
 
 #include "dawn/native/Sampler.h"
 
+#include <cmath>
+
 #include "dawn/native/Device.h"
 #include "dawn/native/ObjectContentHasher.h"
 #include "dawn/native/ValidationUtils_autogen.h"
 
-#include <cmath>
-
 namespace dawn::native {
 
     MaybeError ValidateSamplerDescriptor(DeviceBase*, const SamplerDescriptor* descriptor) {

src/dawn/native/ScratchBuffer.h

@@ -15,11 +15,11 @@
 #ifndef SRC_DAWN_NATIVE_SCRATCHBUFFER_H_
 #define SRC_DAWN_NATIVE_SCRATCHBUFFER_H_
 
+#include <cstdint>
+
 #include "dawn/common/RefCounted.h"
 #include "dawn/native/Buffer.h"
 
-#include <cstdint>
-
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/ShaderModule.cpp

@@ -14,6 +14,8 @@
 
 #include "dawn/native/ShaderModule.h"
 
+#include <sstream>
+
 #include "absl/strings/str_format.h"
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/Constants.h"
@@ -28,9 +30,7 @@
 #include "dawn/native/RenderPipeline.h"
 #include "dawn/native/TintUtils.h"
 
-#include <tint/tint.h>
-
-#include <sstream>
+#include "tint/tint.h"
 
 namespace dawn::native {
 

src/dawn/native/ShaderModule.h

@@ -15,6 +15,12 @@
 #ifndef SRC_DAWN_NATIVE_SHADERMODULE_H_
 #define SRC_DAWN_NATIVE_SHADERMODULE_H_
 
+#include <bitset>
+#include <map>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
 #include "dawn/native/BindingInfo.h"
@@ -29,12 +35,6 @@
 #include "dawn/native/VertexFormat.h"
 #include "dawn/native/dawn_platform.h"
 
-#include <bitset>
-#include <map>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
 namespace tint {
 
     class Program;

src/dawn/native/SpirvValidation.cpp

@@ -14,11 +14,11 @@
 
 #include "dawn/native/SpirvValidation.h"
 
-#include "dawn/native/Device.h"
-
 #include <spirv-tools/libspirv.hpp>
 #include <sstream>
 
+#include "dawn/native/Device.h"
+
 namespace dawn::native {
 
     MaybeError ValidateSpirv(DeviceBase* device,

src/dawn/native/SpirvValidation.h

@@ -15,10 +15,10 @@
 #ifndef SRC_DAWN_NATIVE_SPIRVVALIDATION_H_
 #define SRC_DAWN_NATIVE_SPIRVVALIDATION_H_
 
-#include "dawn/native/Error.h"
-
 #include <vector>
 
+#include "dawn/native/Error.h"
+
 namespace dawn::native {
 
     class DeviceBase;

src/dawn/native/SubresourceStorage.h

@@ -15,16 +15,16 @@
 #ifndef SRC_DAWN_NATIVE_SUBRESOURCESTORAGE_H_
 #define SRC_DAWN_NATIVE_SUBRESOURCESTORAGE_H_
 
-#include "dawn/common/Assert.h"
-#include "dawn/common/TypeTraits.h"
-#include "dawn/native/EnumMaskIterator.h"
-#include "dawn/native/Subresource.h"
-
 #include <array>
 #include <limits>
 #include <memory>
 #include <vector>
 
+#include "dawn/common/Assert.h"
+#include "dawn/common/TypeTraits.h"
+#include "dawn/native/EnumMaskIterator.h"
+#include "dawn/native/Subresource.h"
+
 namespace dawn::native {
 
     // SubresourceStorage<T> acts like a simple map from subresource (aspect, layer, level) to a

src/dawn/native/Texture.h

@@ -15,6 +15,8 @@
 #ifndef SRC_DAWN_NATIVE_TEXTURE_H_
 #define SRC_DAWN_NATIVE_TEXTURE_H_
 
+#include <vector>
+
 #include "dawn/common/ityp_array.h"
 #include "dawn/common/ityp_bitset.h"
 #include "dawn/native/Error.h"
@@ -25,8 +27,6 @@
 
 #include "dawn/native/dawn_platform.h"
 
-#include <vector>
-
 namespace dawn::native {
 
     MaybeError ValidateTextureDescriptor(const DeviceBase* device,

src/dawn/native/TintUtils.cpp

@@ -13,9 +13,10 @@
 // limitations under the License.
 
 #include "dawn/native/TintUtils.h"
+
 #include "dawn/native/Device.h"
 
-#include <tint/tint.h>
+#include "tint/tint.h"
 
 namespace dawn::native {