From 687527b9fa12fb24e4a15175d9de5315843d5ccb Mon Sep 17 00:00:00 2001
From: Corentin Wallez <cwallez@chromium.org>
Date: Wed, 8 Apr 2020 18:40:04 +0000
Subject: [PATCH] Remove the use of proxy Dawn GN group targets.

The GN targets have moved in Dawn and the former names are groups that
proxy to the name path. Change the paths in Chromium so that the proxy
groups can be removed in Dawn.

Bug: chromium:1064305
Change-Id: I75abda829d8677699bc0165d2fd27c4466a815cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2142213
Reviewed-by: Peng Huang <penghuang@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757505}
---
 components/viz/common/BUILD.gn                               | 2 +-
 components/viz/service/BUILD.gn                              | 5 +++--
 gpu/BUILD.gn                                                 | 2 +-
 gpu/command_buffer/common/BUILD.gn                           | 2 +-
 gpu/command_buffer/service/BUILD.gn                          | 5 +++--
 skia/BUILD.gn                                                | 5 +++--
 .../platform/graphics/gpu/webgpu_swap_buffer_provider.cc     | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/components/viz/common/BUILD.gn b/components/viz/common/BUILD.gn
index 48d018436faa23..66b9a70814a486 100644
--- a/components/viz/common/BUILD.gn
+++ b/components/viz/common/BUILD.gn
@@ -123,9 +123,9 @@ if (skia_use_dawn) {
 
     deps = [
       "//base",
-      "//third_party/dawn:libdawn_native",
       "//third_party/dawn/src/dawn:dawncpp",
       "//third_party/dawn/src/dawn:libdawn_proc",
+      "//third_party/dawn/src/dawn_native",
     ]
   }
 }
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index b8f0e29d8eeb37..596e298cb3209d 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -413,8 +413,9 @@ viz_source_set("gpu_service_dependencies") {
     public_deps += [ "//third_party/dawn/src/dawn:dawn_headers" ]
 
     deps += [
-      "//third_party/dawn:libdawn_native",
-      "//third_party/dawn/src/dawn:libdawn",
+      "//third_party/dawn/src/dawn:dawncpp",
+      "//third_party/dawn/src/dawn:libdawn_proc",
+      "//third_party/dawn/src/dawn_native",
     ]
   }
 }
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 2cc0c63f37f754..e129019b981ea1 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -414,9 +414,9 @@ test("gl_tests") {
 
   if (use_dawn) {
     deps += [
-      "//third_party/dawn:libdawn_native",
       "//third_party/dawn/src/dawn:dawncpp",
       "//third_party/dawn/src/dawn:libdawn_proc",
+      "//third_party/dawn/src/dawn_native",
     ]
   }
 
diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn
index b1d05d401ec55f..155fa3fb315c77 100644
--- a/gpu/command_buffer/common/BUILD.gn
+++ b/gpu/command_buffer/common/BUILD.gn
@@ -176,7 +176,7 @@ source_set("webgpu_sources") {
   ]
 
   if (use_dawn) {
-    deps += [ "//third_party/dawn:libdawn_wire" ]
+    deps += [ "//third_party/dawn/src/dawn_wire" ]
   }
 
   public_deps = [
diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn
index ccf4bff1bb3d47..96cbd5231b18b4 100644
--- a/gpu/command_buffer/service/BUILD.gn
+++ b/gpu/command_buffer/service/BUILD.gn
@@ -368,7 +368,7 @@ target(link_target_type, "gles2_sources") {
   }
 
   if (use_dawn) {
-    deps += [ "//third_party/dawn:libdawn_native" ]
+    deps += [ "//third_party/dawn/src/dawn_native" ]
   }
 
   if (is_mac) {
@@ -390,7 +390,8 @@ target(link_target_type, "gles2_sources") {
   if (skia_use_dawn) {
     deps += [
       "//components/viz/common:dawn_context_provider",
-      "//third_party/dawn/src/dawn:libdawn",
+      "//third_party/dawn/src/dawn:dawncpp",
+      "//third_party/dawn/src/dawn:libdawn_proc",
     ]
   }
 
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index d03158a6b997ac..990fd1bb2b2b79 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -521,8 +521,9 @@ component("skia") {
   if (skia_use_dawn) {
     public_deps += [ "//third_party/dawn/src/dawn:dawncpp_headers" ]
     deps += [
-      "//third_party/dawn:libdawn_native",
-      "//third_party/dawn/src/dawn:libdawn",
+      "//third_party/dawn/src/dawn:dawncpp",
+      "//third_party/dawn/src/dawn:libdawn_proc",
+      "//third_party/dawn/src/dawn_native",
     ]
   }
 
diff --git a/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc b/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc
index 98dc0c889fc00a..981331e25e7fed 100644
--- a/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc
+++ b/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc
@@ -139,7 +139,7 @@ bool WebGPUSwapBufferProvider::PrepareTransferableResource(
   client_->OnTextureTransferred();
 
   // Make Dawn relinquish access to the texture so it can be used by the
-  // compositor. This will call dawn::Texture::Destroy so that further accesses
+  // compositor. This will call wgpu::Texture::Destroy so that further accesses
   // to the texture are errors.
   gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface();
   DCHECK_NE(wire_texture_id_, 0u);