tint->dawn: Move src/common -> src/dawn/common

Also remove stuttering from the target names by dropping the 'dawn_' prefix.

Bug: dawn:1275
Change-Id: Iac79f9927010b8e5edeb7e0949092b34431d54dd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79061
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

CMakeLists.txt

@@ -211,9 +211,9 @@ set(CMAKE_CXX_STANDARD "17")
 ################################################################################
 
 add_subdirectory(third_party)
-add_subdirectory(src/common)
 add_subdirectory(generator)
 add_subdirectory(src/dawn)
+add_subdirectory(src/dawn/common)
 add_subdirectory(src/dawn_platform)
 add_subdirectory(src/dawn_native)
 add_subdirectory(src/dawn_wire)

docs/dawn/overview.md

@@ -13,7 +13,8 @@ This repository contains the implementation of Dawn, which is itself composed of
 - [`infra`](../infra): configuration file for the commit-queue infrastructure.
 - [`scripts`](../scripts): contains a grab-bag of files that are used for building Dawn, in testing, etc.
 - [`src`](../src):
-  - [`common`](../src/common): helper code that is allowed to be used by Dawn's core libraries, `dawn_native` and `dawn_wire`. Also allowed for use in all other Dawn targets.
+  - [`dawn`](../src/dawn): root directory for Dawn code
+      - [`common`](../src/dawn/common): helper code that is allowed to be used by Dawn's core libraries, `dawn_native` and `dawn_wire`. Also allowed for use in all other Dawn targets.
   - [`dawn_native`](../src/dawn_native): code for the implementation of WebGPU on top of graphics APIs. Files in this folder are the "frontend" while subdirectories are "backends".
       - `<backend>`: code for the implementation of the backend on a specific graphics API, for example `d3d12`, `metal` or `vulkan`.
   - [`dawn_platform`](../src/dawn_platform): definition of interfaces for dependency injection in `dawn_native` or `dawn_wire`.

examples/BUILD.gn

@@ -33,16 +33,16 @@ static_library("dawn_sample_utils") {
 
   # Export all of these as public deps so that `gn check` allows includes
   public_deps = [
-    "${dawn_root}/src/common",
     "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
+    "${dawn_root}/src/dawn/common",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_wire",
     "${dawn_root}/src/utils:dawn_bindings",
     "${dawn_root}/src/utils:dawn_glfw",
     "${dawn_root}/src/utils:dawn_utils",
   ]
-  public_configs = [ "${dawn_root}/src/common:dawn_internal" ]
+  public_configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
 }
 
 # Template for samples to avoid listing dawn_sample_utils as a dep every time

examples/ManualSwapChainTest.cpp

@@ -51,8 +51,8 @@
 //    - TODO can't be tested yet: check cycling the same window over multiple devices.
 //    - TODO can't be tested yet: check cycling the same window over multiple formats.
 
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
 #include "utils/ComboRenderPipelineDescriptor.h"
 #include "utils/GLFWUtils.h"
 #include "utils/ScopedAutoreleasePool.h"

examples/SampleUtils.cpp

@@ -14,10 +14,10 @@
 
 #include "SampleUtils.h"
 
-#include "common/Assert.h"
-#include "common/Log.h"
-#include "common/Platform.h"
-#include "common/SystemUtils.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/SystemUtils.h"
 #include "utils/BackendBinding.h"
 #include "utils/GLFWUtils.h"
 #include "utils/TerribleCommandBuffer.h"

generator/templates/dawn_native/ObjectType.h

@@ -17,7 +17,7 @@
 #ifndef {{DIR}}_OBJECTTPYE_AUTOGEN_H_
 #define {{DIR}}_OBJECTTPYE_AUTOGEN_H_
 
-#include "common/ityp_array.h"
+#include "dawn/common/ityp_array.h"
 
 #include <cstdint>
 

generator/templates/dawn_wire/ObjectType.h

@@ -15,7 +15,7 @@
 #ifndef DAWNWIRE_OBJECTTPYE_AUTOGEN_H_
 #define DAWNWIRE_OBJECTTPYE_AUTOGEN_H_
 
-#include "common/ityp_array.h"
+#include "dawn/common/ityp_array.h"
 
 namespace dawn::wire {
 

generator/templates/dawn_wire/WireCmd.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn_wire/WireCmd_autogen.h"
 
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
 #include "dawn_wire/BufferConsumer_impl.h"
 #include "dawn_wire/Wire.h"
 

generator/templates/dawn_wire/client/ApiProcs.cpp

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "common/Log.h"
+#include "dawn/common/Log.h"
 #include "dawn_wire/client/ApiObjects.h"
 #include "dawn_wire/client/Client.h"
 

generator/templates/dawn_wire/client/ClientHandlers.cpp

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 #include "dawn_wire/client/Client.h"
 
 #include <string>

generator/templates/dawn_wire/server/ServerDoers.cpp

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 #include "dawn_wire/server/Server.h"
 
 namespace dawn::wire::server {

generator/templates/dawn_wire/server/ServerHandlers.cpp

@@ -12,7 +12,7 @@
 //* See the License for the specific language governing permissions and
 //* limitations under the License.
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 #include "dawn_wire/server/Server.h"
 
 namespace dawn::wire::server {

src/dawn/BUILD.gn

@@ -30,7 +30,7 @@ dawn_json_generator("dawn_headers_gen") {
 }
 
 source_set("dawn_headers") {
-  all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
+  all_dependent_configs = [ "${dawn_root}/src/dawn/common:public_include_dirs" ]
   public_deps = [ ":dawn_headers_gen" ]
 
   sources = get_target_outputs(":dawn_headers_gen")

src/dawn/common/Assert.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
 
 #include <cstdlib>
 

src/dawn/common/Assert.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_ASSERT_H_
 #define COMMON_ASSERT_H_
 
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
 
 // Dawn asserts to be used instead of the regular C stdlib assert function (if you don't use assert
 // yet, you should start now!). In debug ASSERT(condition) will trigger an error, otherwise in

src/dawn/common/BUILD.gn

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../scripts/dawn_overrides_with_defaults.gni")
+import("../../../scripts/dawn_overrides_with_defaults.gni")
 
 import("//build_overrides/build.gni")
 import("${dawn_root}/scripts/dawn_features.gni")
@@ -35,16 +35,16 @@ if (build_with_chromium) {
 # Common dawn configs
 ###############################################################################
 
-config("dawn_public_include_dirs") {
+config("public_include_dirs") {
   include_dirs = [
-    "${target_gen_dir}/../../src/include",
+    "${target_gen_dir}/../../../src/include",
     "${dawn_root}/src/include",
   ]
 }
 
-config("dawn_internal") {
+config("internal_config") {
   include_dirs = [
-    "${target_gen_dir}/../../src",
+    "${target_gen_dir}/../../../src",
     "${dawn_root}/src",
   ]
 
@@ -92,8 +92,9 @@ config("dawn_internal") {
   # Only internal Dawn targets can use this config, this means only targets in
   # this BUILD.gn file and related subdirs.
   visibility = [
-    "../*",
-    "../../examples/*",
+    "${dawn_root}/examples/*",
+    "${dawn_root}/src/*",
+    "${dawn_root}/src/dawn/*",
   ]
 
   cflags = []
@@ -234,7 +235,7 @@ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
       sources += [ "SystemUtils_mac.mm" ]
     }
 
-    public_configs = [ ":dawn_internal" ]
+    public_configs = [ ":internal_config" ]
     deps = [
       "${dawn_root}/src/dawn:dawn_headers",
       "${dawn_root}/src/dawn:dawncpp_headers",

src/dawn/common/BitSetIterator.h

@@ -15,9 +15,9 @@
 #ifndef COMMON_BITSETITERATOR_H_
 #define COMMON_BITSETITERATOR_H_
 
-#include "common/Assert.h"
-#include "common/Math.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/UnderlyingType.h"
 
 #include <bitset>
 #include <limits>

src/dawn/common/ConcurrentCache.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_CONCURRENT_CACHE_H_
 #define COMMON_CONCURRENT_CACHE_H_
 
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
 
 #include <mutex>
 #include <unordered_set>

src/dawn/common/CoreFoundationRef.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_COREFOUNDATIONREF_H_
 #define COMMON_COREFOUNDATIONREF_H_
 
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 

src/dawn/common/DynamicLib.cpp

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/DynamicLib.h"
+#include "dawn/common/DynamicLib.h"
 
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
 
 #if DAWN_PLATFORM_WINDOWS
-#    include "common/windows_with_undefs.h"
+#    include "dawn/common/windows_with_undefs.h"
 #    if DAWN_PLATFORM_WINUWP
-#        include "common/WindowsUtils.h"
+#        include "dawn/common/WindowsUtils.h"
 #    endif
 #elif DAWN_PLATFORM_POSIX
 #    include <dlfcn.h>

src/dawn/common/DynamicLib.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_DYNAMICLIB_H_
 #define COMMON_DYNAMICLIB_H_
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 #include <string>
 #include <type_traits>

src/dawn/common/GPUInfo.cpp

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

src/dawn/common/HashUtils.h

@@ -15,9 +15,9 @@
 #ifndef COMMON_HASHUTILS_H_
 #define COMMON_HASHUTILS_H_
 
-#include "common/Platform.h"
-#include "common/TypedInteger.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Platform.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/ityp_bitset.h"
 
 #include <bitset>
 #include <functional>

src/dawn/common/IOKitRef.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_IOKITREF_H_
 #define COMMON_IOKITREF_H_
 
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
 
 #include <IOKit/IOKitLib.h>
 

src/dawn/common/LinkedList.h

@@ -11,7 +11,7 @@
 #ifndef COMMON_LINKED_LIST_H
 #define COMMON_LINKED_LIST_H
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 // Simple LinkedList type. (See the Q&A section to understand how this
 // differs from std::list).

src/dawn/common/Log.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/Log.h"
+#include "dawn/common/Log.h"
 
-#include "common/Assert.h"
-#include "common/Platform.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
 
 #include <cstdio>
 

src/dawn/common/Math.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/Math.h"
+#include "dawn/common/Math.h"
 
-#include "common/Assert.h"
-#include "common/Platform.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Platform.h"
 
 #include <algorithm>
 #include <cmath>

src/dawn/common/Math.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_MATH_H_
 #define COMMON_MATH_H_
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 #include <cstddef>
 #include <cstdint>

src/dawn/common/NSRef.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_NSREF_H_
 #define COMMON_NSREF_H_
 
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
 
 #import <Foundation/NSObject.h>
 

src/dawn/common/RefBase.h

@@ -15,8 +15,8 @@
 #ifndef COMMON_REFBASE_H_
 #define COMMON_REFBASE_H_
 
-#include "common/Assert.h"
-#include "common/Compiler.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
 
 #include <type_traits>
 #include <utility>

src/dawn/common/RefCounted.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 #include <cstddef>
 

src/dawn/common/RefCounted.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_REFCOUNTED_H_
 #define COMMON_REFCOUNTED_H_
 
-#include "common/RefBase.h"
+#include "dawn/common/RefBase.h"
 
 #include <atomic>
 #include <cstdint>

src/dawn/common/Result.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/Result.h"
+#include "dawn/common/Result.h"
 
 // Implementation details of the tagged pointer Results
 namespace detail {

src/dawn/common/Result.h

@@ -15,8 +15,8 @@
 #ifndef COMMON_RESULT_H_
 #define COMMON_RESULT_H_
 
-#include "common/Assert.h"
-#include "common/Compiler.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Compiler.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -63,7 +63,7 @@ class [[nodiscard]] Result<void, E> {
     Result();
     Result(std::unique_ptr<E> error);
 
-    Result(Result<void, E>&& other);
+    Result(Result<void, E> && other);
     Result<void, E>& operator=(Result<void, E>&& other);
 
     ~Result();
@@ -116,12 +116,12 @@ class [[nodiscard]] Result<T*, E> {
     static_assert(alignof_if_defined_else_default<E, 4> >= 4,
                   "Result<T*, E*> reserves two bits for tagging pointers");
 
-    Result(T* success);
+    Result(T * success);
     Result(std::unique_ptr<E> error);
 
     // Support returning a Result<T*, E*> from a Result<TChild*, E*>
     template <typename TChild>
-    Result(Result<TChild*, E>&& other);
+    Result(Result<TChild*, E> && other);
     template <typename TChild>
     Result<T*, E>& operator=(Result<TChild*, E>&& other);
 
@@ -151,7 +151,7 @@ class [[nodiscard]] Result<const T*, E> {
     Result(const T* success);
     Result(std::unique_ptr<E> error);
 
-    Result(Result<const T*, E>&& other);
+    Result(Result<const T*, E> && other);
     Result<const T*, E>& operator=(Result<const T*, E>&& other);
 
     ~Result();
@@ -178,13 +178,13 @@ class [[nodiscard]] Result<Ref<T>, E> {
                   "Result<Ref<T>, E> reserves two bits for tagging pointers");
 
     template <typename U>
-    Result(Ref<U>&& success);
+    Result(Ref<U> && success);
     template <typename U>
     Result(const Ref<U>& success);
     Result(std::unique_ptr<E> error);
 
     template <typename U>
-    Result(Result<Ref<U>, E>&& other);
+    Result(Result<Ref<U>, E> && other);
     template <typename U>
     Result<Ref<U>, E>& operator=(Result<Ref<U>, E>&& other);
 
@@ -209,10 +209,10 @@ class [[nodiscard]] Result<Ref<T>, E> {
 template <typename T, typename E>
 class [[nodiscard]] Result {
   public:
-    Result(T&& success);
+    Result(T && success);
     Result(std::unique_ptr<E> error);
 
-    Result(Result<T, E>&& other);
+    Result(Result<T, E> && other);
     Result<T, E>& operator=(Result<T, E>&& other);
 
     ~Result();

src/dawn/common/SerialMap.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_SERIALMAP_H_
 #define COMMON_SERIALMAP_H_
 
-#include "common/SerialStorage.h"
+#include "dawn/common/SerialStorage.h"
 
 #include <map>
 #include <vector>

src/dawn/common/SerialQueue.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_SERIALQUEUE_H_
 #define COMMON_SERIALQUEUE_H_
 
-#include "common/SerialStorage.h"
+#include "dawn/common/SerialStorage.h"
 
 #include <vector>
 
@@ -39,7 +39,6 @@ struct SerialStorageTraits<SerialQueue<SerialT, ValueT>> {
 template <typename Serial, typename Value>
 class SerialQueue : public SerialStorage<SerialQueue<Serial, Value>> {
   public:
-
     // The serial must be given in (not strictly) increasing order.
     void Enqueue(const Value& value, Serial serial);
     void Enqueue(Value&& value, Serial serial);

src/dawn/common/SerialStorage.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_SERIALSTORAGE_H_
 #define COMMON_SERIALSTORAGE_H_
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 #include <cstdint>
 #include <utility>

src/dawn/common/SlabAllocator.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/SlabAllocator.h"
+#include "dawn/common/SlabAllocator.h"
 
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
 
 #include <algorithm>
 #include <cstdlib>

src/dawn/common/SlabAllocator.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_SLABALLOCATOR_H_
 #define COMMON_SLABALLOCATOR_H_
 
-#include "common/PlacementAllocated.h"
+#include "dawn/common/PlacementAllocated.h"
 
 #include <cstdint>
 #include <type_traits>

src/dawn/common/StackContainer.h

@@ -7,7 +7,7 @@
 #ifndef COMMON_STACKCONTAINER_H_
 #define COMMON_STACKCONTAINER_H_
 
-#include "common/Compiler.h"
+#include "dawn/common/Compiler.h"
 
 #include <cstddef>
 #include <vector>

src/dawn/common/SystemUtils.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/SystemUtils.h"
+#include "dawn/common/SystemUtils.h"
 
-#include "common/Assert.h"
-#include "common/Log.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Log.h"
 
 #if defined(DAWN_PLATFORM_WINDOWS)
 #    include <Windows.h>

src/dawn/common/SystemUtils.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_SYSTEMUTILS_H_
 #define COMMON_SYSTEMUTILS_H_
 
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
 
 #include <optional>
 #include <string>

src/dawn/common/SystemUtils_mac.mm

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/SystemUtils.h"
+#include "dawn/common/SystemUtils.h"
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 #import <Foundation/NSProcessInfo.h>
 

src/dawn/common/TypedInteger.h

@@ -15,8 +15,8 @@
 #ifndef COMMON_TYPEDINTEGER_H_
 #define COMMON_TYPEDINTEGER_H_
 
-#include "common/Assert.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/UnderlyingType.h"
 
 #include <limits>
 #include <type_traits>

src/dawn/common/WindowsUtils.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common/WindowsUtils.h"
+#include "dawn/common/WindowsUtils.h"
 
-#include "common/windows_with_undefs.h"
+#include "dawn/common/windows_with_undefs.h"
 
 #include <memory>
 

src/dawn/common/ityp_array.h

@@ -15,8 +15,8 @@
 #ifndef COMMON_ITYP_ARRAY_H_
 #define COMMON_ITYP_ARRAY_H_
 
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
 
 #include <array>
 #include <cstddef>

src/dawn/common/ityp_bitset.h

@@ -15,9 +15,9 @@
 #ifndef COMMON_ITYP_BITSET_H_
 #define COMMON_ITYP_BITSET_H_
 
-#include "common/BitSetIterator.h"
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
 
 namespace ityp {
 

src/dawn/common/ityp_span.h

@@ -15,8 +15,8 @@
 #ifndef COMMON_ITYP_SPAN_H_
 #define COMMON_ITYP_SPAN_H_
 
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
 
 #include <type_traits>
 

src/dawn/common/ityp_stack_vec.h

@@ -15,9 +15,9 @@
 #ifndef COMMON_ITYP_STACK_VEC_H_
 #define COMMON_ITYP_STACK_VEC_H_
 
-#include "common/Assert.h"
-#include "common/StackContainer.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/StackContainer.h"
+#include "dawn/common/UnderlyingType.h"
 
 namespace ityp {
 

src/dawn/common/ityp_vector.h

@@ -15,8 +15,8 @@
 #ifndef COMMON_ITYP_VECTOR_H_
 #define COMMON_ITYP_VECTOR_H_
 
-#include "common/TypedInteger.h"
-#include "common/UnderlyingType.h"
+#include "dawn/common/TypedInteger.h"
+#include "dawn/common/UnderlyingType.h"
 
 #include <type_traits>
 #include <vector>

src/dawn/common/vulkan_platform.h

@@ -22,7 +22,7 @@
 #    error "vulkan.h included before vulkan_platform.h"
 #endif
 
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -156,13 +156,13 @@ namespace dawn::native::vulkan {
 // headers that vulkan.h includes that we have "undefs" for.
 #if defined(DAWN_PLATFORM_WINDOWS)
 #    define VK_USE_PLATFORM_WIN32_KHR
-#    include "common/windows_with_undefs.h"
+#    include "dawn/common/windows_with_undefs.h"
 #endif  // DAWN_PLATFORM_WINDOWS
 
 #if defined(DAWN_USE_X11)
 #    define VK_USE_PLATFORM_XLIB_KHR
 #    define VK_USE_PLATFORM_XCB_KHR
-#    include "common/xlib_with_undefs.h"
+#    include "dawn/common/xlib_with_undefs.h"
 #endif  // defined(DAWN_USE_X11)
 
 #if defined(DAWN_ENABLE_BACKEND_METAL)

src/dawn/common/windows_with_undefs.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_WINDOWS_WITH_UNDEFS_H_
 #define COMMON_WINDOWS_WITH_UNDEFS_H_
 
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
 
 #if !defined(DAWN_PLATFORM_WINDOWS)
 #    error "windows_with_undefs.h included on non-Windows"

src/dawn/common/xlib_with_undefs.h

@@ -15,7 +15,7 @@
 #ifndef COMMON_XLIB_WITH_UNDEFS_H_
 #define COMMON_XLIB_WITH_UNDEFS_H_
 
-#include "common/Platform.h"
+#include "dawn/common/Platform.h"
 
 #if !defined(DAWN_PLATFORM_LINUX)
 #    error "xlib_with_undefs.h included on non-Linux"

src/dawn_native/Adapter.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/Adapter.h"
 
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
 #include "dawn_native/Device.h"
 #include "dawn_native/Instance.h"
 #include "dawn_native/ValidationUtils_autogen.h"

src/dawn_native/Adapter.h

@@ -17,8 +17,8 @@
 
 #include "dawn_native/DawnNative.h"
 
-#include "common/RefCounted.h"
-#include "common/ityp_span.h"
+#include "dawn/common/RefCounted.h"
+#include "dawn/common/ityp_span.h"
 #include "dawn_native/Error.h"
 #include "dawn_native/Features.h"
 #include "dawn_native/Limits.h"

src/dawn_native/AsyncTask.h

@@ -20,7 +20,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
 
 namespace dawn::platform {
     class WaitableEvent;

src/dawn_native/AttachmentState.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/AttachmentState.h"
 
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
 #include "dawn_native/Device.h"
 #include "dawn_native/ObjectContentHasher.h"
 #include "dawn_native/Texture.h"

src/dawn_native/AttachmentState.h

@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_ATTACHMENTSTATE_H_
 #define DAWNNATIVE_ATTACHMENTSTATE_H_
 
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
 #include "dawn_native/CachedObject.h"
 #include "dawn_native/IntegerTypes.h"
 #include "dawn_native/ObjectBase.h"

src/dawn_native/BUILD.gn

@@ -65,7 +65,7 @@ group("dawn_abseil") {
 }
 
 config("dawn_native_internal") {
-  configs = [ "${dawn_root}/src/common:dawn_internal" ]
+  configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
 
   # Suppress warnings that Metal isn't in the deployment target of Chrome:
   # initialization of the Metal backend is behind a IsMetalSupported check so
@@ -138,7 +138,7 @@ if (dawn_enable_opengl) {
 # dependencies of dawn_native
 source_set("dawn_native_headers") {
   public_deps = [ "${dawn_root}/src/dawn:dawncpp_headers" ]
-  all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
+  all_dependent_configs = [ "${dawn_root}/src/dawn/common:public_include_dirs" ]
   sources = [
     "${dawn_root}/src/include/dawn_native/DawnNative.h",
     "${dawn_root}/src/include/dawn_native/dawn_native_export.h",
@@ -160,7 +160,7 @@ source_set("dawn_native_sources") {
   deps = [
     ":dawn_native_headers",
     ":dawn_native_utils_gen",
-    "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn/common",
     "${dawn_spirv_tools_dir}:spvtools_opt",
     "${dawn_spirv_tools_dir}:spvtools_val",
     "${dawn_tint_dir}/src:libtint",
@@ -711,7 +711,7 @@ dawn_component("dawn_native") {
 
   deps = [
     ":dawn_native_sources",
-    "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn/common",
   ]
   sources = [ "DawnNative.cpp" ]
   configs = [ ":dawn_native_internal" ]

src/dawn_native/BindGroup.cpp

@@ -14,9 +14,9 @@
 
 #include "dawn_native/BindGroup.h"
 
-#include "common/Assert.h"
-#include "common/Math.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/ityp_bitset.h"
 #include "dawn_native/BindGroupLayout.h"
 #include "dawn_native/Buffer.h"
 #include "dawn_native/ChainUtils_autogen.h"

src/dawn_native/BindGroup.h

@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_BINDGROUP_H_
 #define DAWNNATIVE_BINDGROUP_H_
 
-#include "common/Constants.h"
-#include "common/Math.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
 #include "dawn_native/BindGroupLayout.h"
 #include "dawn_native/Error.h"
 #include "dawn_native/Forward.h"

src/dawn_native/BindGroupLayout.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/BindGroupLayout.h"
 
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
 
 #include "dawn_native/ChainUtils_autogen.h"
 #include "dawn_native/Device.h"

src/dawn_native/BindGroupLayout.h

@@ -15,11 +15,11 @@
 #ifndef DAWNNATIVE_BINDGROUPLAYOUT_H_
 #define DAWNNATIVE_BINDGROUPLAYOUT_H_
 
-#include "common/Constants.h"
-#include "common/Math.h"
-#include "common/SlabAllocator.h"
-#include "common/ityp_span.h"
-#include "common/ityp_vector.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/SlabAllocator.h"
+#include "dawn/common/ityp_span.h"
+#include "dawn/common/ityp_vector.h"
 #include "dawn_native/BindingInfo.h"
 #include "dawn_native/CachedObject.h"
 #include "dawn_native/Error.h"

src/dawn_native/BindGroupTracker.h

@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_BINDGROUPTRACKER_H_
 #define DAWNNATIVE_BINDGROUPTRACKER_H_
 
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
 #include "dawn_native/BindGroupLayout.h"
 #include "dawn_native/Pipeline.h"
 #include "dawn_native/PipelineLayout.h"

src/dawn_native/BindingInfo.h

@@ -15,8 +15,8 @@
 #ifndef DAWNNATIVE_BINDINGINFO_H_
 #define DAWNNATIVE_BINDINGINFO_H_
 
-#include "common/Constants.h"
-#include "common/ityp_array.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
 #include "dawn_native/Error.h"
 #include "dawn_native/Format.h"
 #include "dawn_native/IntegerTypes.h"

src/dawn_native/BuddyAllocator.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn_native/BuddyAllocator.h"
 
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
 
 namespace dawn::native {
 

src/dawn_native/BuddyMemoryAllocator.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/BuddyMemoryAllocator.h"
 
-#include "common/Math.h"
+#include "dawn/common/Math.h"
 #include "dawn_native/ResourceHeapAllocator.h"
 
 namespace dawn::native {

src/dawn_native/Buffer.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn_native/Buffer.h"
 
-#include "common/Alloc.h"
-#include "common/Assert.h"
+#include "dawn/common/Alloc.h"
+#include "dawn/common/Assert.h"
 #include "dawn_native/Commands.h"
 #include "dawn_native/Device.h"
 #include "dawn_native/DynamicUploader.h"

src/dawn_native/CachedObject.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/CachedObject.h"
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 
 namespace dawn::native {
 

src/dawn_native/CommandAllocator.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn_native/CommandAllocator.h"
 
-#include "common/Assert.h"
-#include "common/Math.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
 
 #include <algorithm>
 #include <climits>

src/dawn_native/CommandAllocator.h

@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_COMMAND_ALLOCATOR_H_
 #define DAWNNATIVE_COMMAND_ALLOCATOR_H_
 
-#include "common/Assert.h"
-#include "common/Math.h"
-#include "common/NonCopyable.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/Math.h"
+#include "dawn/common/NonCopyable.h"
 
 #include <cstddef>
 #include <cstdint>

src/dawn_native/CommandBuffer.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/CommandBuffer.h"
 
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
 #include "dawn_native/Buffer.h"
 #include "dawn_native/CommandEncoder.h"
 #include "dawn_native/CommandValidation.h"

src/dawn_native/CommandBufferStateTracker.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn_native/CommandBufferStateTracker.h"
 
-#include "common/Assert.h"
-#include "common/BitSetIterator.h"
+#include "dawn/common/Assert.h"
+#include "dawn/common/BitSetIterator.h"
 #include "dawn_native/BindGroup.h"
 #include "dawn_native/ComputePassEncoder.h"
 #include "dawn_native/ComputePipeline.h"

src/dawn_native/CommandBufferStateTracker.h

@@ -15,9 +15,9 @@
 #ifndef DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
 #define DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
 
-#include "common/Constants.h"
-#include "common/ityp_array.h"
-#include "common/ityp_bitset.h"
+#include "dawn/common/Constants.h"
+#include "dawn/common/ityp_array.h"
+#include "dawn/common/ityp_bitset.h"
 #include "dawn_native/BindingInfo.h"
 #include "dawn_native/Error.h"
 #include "dawn_native/Forward.h"

src/dawn_native/CommandEncoder.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn_native/CommandEncoder.h"
 
-#include "common/BitSetIterator.h"
-#include "common/Math.h"
+#include "dawn/common/BitSetIterator.h"
+#include "dawn/common/Math.h"
 #include "dawn_native/BindGroup.h"
 #include "dawn_native/Buffer.h"
 #include "dawn_native/ChainUtils_autogen.h"

src/dawn_native/CommandValidation.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/CommandValidation.h"
 
-#include "common/BitSetIterator.h"
+#include "dawn/common/BitSetIterator.h"
 #include "dawn_native/BindGroup.h"
 #include "dawn_native/Buffer.h"
 #include "dawn_native/CommandBufferStateTracker.h"

src/dawn_native/Commands.h

@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_COMMANDS_H_
 #define DAWNNATIVE_COMMANDS_H_
 
-#include "common/Constants.h"
+#include "dawn/common/Constants.h"
 
 #include "dawn_native/AttachmentState.h"
 #include "dawn_native/BindingInfo.h"

src/dawn_native/CompilationMessages.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/CompilationMessages.h"
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 #include "dawn_native/dawn_platform.h"
 
 #include <tint/tint.h>

src/dawn_native/CompilationMessages.h

@@ -17,7 +17,7 @@
 
 #include "dawn_native/dawn_platform.h"
 
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
 
 #include <string>
 #include <vector>
@@ -59,4 +59,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMPILATIONMESSAGES_H_
+#endif  // DAWNNATIVE_COMPILATIONMESSAGES_H_

src/dawn_native/ComputePipeline.h

@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_COMPUTEPIPELINE_H_
 #define DAWNNATIVE_COMPUTEPIPELINE_H_
 
-#include "common/NonCopyable.h"
+#include "dawn/common/NonCopyable.h"
 #include "dawn_native/Forward.h"
 #include "dawn_native/Pipeline.h"
 

src/dawn_native/CopyTextureForBrowserHelper.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/CopyTextureForBrowserHelper.h"
 
-#include "common/Log.h"
+#include "dawn/common/Log.h"
 #include "dawn_native/BindGroup.h"
 #include "dawn_native/BindGroupLayout.h"
 #include "dawn_native/Buffer.h"

src/dawn_native/CreatePipelineAsyncTask.h

@@ -15,7 +15,7 @@
 #ifndef DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
 #define DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
 
-#include "common/RefCounted.h"
+#include "dawn/common/RefCounted.h"
 #include "dawn/webgpu.h"
 #include "dawn_native/CallbackTaskManager.h"
 #include "dawn_native/Error.h"

src/dawn_native/DawnNative.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/DawnNative.h"
 
-#include "common/Log.h"
+#include "dawn/common/Log.h"
 #include "dawn_native/BindGroupLayout.h"
 #include "dawn_native/Buffer.h"
 #include "dawn_native/Device.h"

src/dawn_native/Device.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/Device.h"
 
-#include "common/Log.h"
+#include "dawn/common/Log.h"
 #include "dawn_native/Adapter.h"
 #include "dawn_native/AsyncTask.h"
 #include "dawn_native/AttachmentState.h"

src/dawn_native/DynamicUploader.cpp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "dawn_native/DynamicUploader.h"
-#include "common/Math.h"
+#include "dawn/common/Math.h"
 #include "dawn_native/Device.h"
 
 namespace dawn::native {

src/dawn_native/EncodingContext.cpp

@@ -14,7 +14,7 @@
 
 #include "dawn_native/EncodingContext.h"
 
-#include "common/Assert.h"
+#include "dawn/common/Assert.h"
 #include "dawn_native/CommandEncoder.h"
 #include "dawn_native/Commands.h"
 #include "dawn_native/Device.h"