summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlink Reformat <blink-reformat@chromium.org>2018-04-08 00:31:06 +0900
committerQijiang Fan <fqj@google.com>2020-06-05 08:59:58 +0900
commit375bd75483a3ff1366667d4a6c14de52f5c0a826 (patch)
treeb854a3bc6ac25be22b42ad2ae2af475a5da58d69
parent4467c0a42e88d573291df57ca8b63138d73115fa (diff)
downloadlibchrome-375bd75483a3ff1366667d4a6c14de52f5c0a826.tar.gz
The Great Blink mv for source files, part 1.
Update file contents without moving files. NOAUTOREVERT=true NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true TBR=darin@chromium.org Bug: 768828 Change-Id: I8a2f4535a49a25f44b43df32f25691c0a2556d28 Reviewed-on: https://chromium-review.googlesource.com/1001152 Commit-Queue: Blink Reformat <blink-reformat@chromium.org> Reviewed-by: Blink Reformat <blink-reformat@chromium.org> Reviewed-by: Kent Tamura <tkent@chromium.org> Cr-Commit-Position: refs/heads/master@{#549060} CrOS-Libchrome-Original-Commit: a30d423812ad0d766e93b0f3a53523807b50b17b
-rw-r--r--mojo/public/cpp/bindings/array_traits_wtf_vector.h2
-rw-r--r--mojo/public/cpp/bindings/lib/string_traits_wtf.cc2
-rw-r--r--mojo/public/cpp/bindings/lib/wtf_clone_equals_util.h8
-rw-r--r--mojo/public/cpp/bindings/lib/wtf_hash_util.h6
-rw-r--r--mojo/public/cpp/bindings/map_traits_wtf_hash_map.h2
-rw-r--r--mojo/public/cpp/bindings/string_traits_wtf.h2
-rw-r--r--mojo/public/cpp/bindings/tests/wtf_hash_unittest.cc2
-rw-r--r--mojo/public/cpp/bindings/tests/wtf_types_unittest.cc2
-rw-r--r--mojo/public/tools/bindings/blink_bindings_configuration.gni6
-rw-r--r--mojo/public/tools/bindings/chromium_bindings_configuration.gni4
-rw-r--r--mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl10
11 files changed, 23 insertions, 23 deletions
diff --git a/mojo/public/cpp/bindings/array_traits_wtf_vector.h b/mojo/public/cpp/bindings/array_traits_wtf_vector.h
index 0b59a704e0..83d2ba3f51 100644
--- a/mojo/public/cpp/bindings/array_traits_wtf_vector.h
+++ b/mojo/public/cpp/bindings/array_traits_wtf_vector.h
@@ -6,7 +6,7 @@
#define MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_WTF_VECTOR_H_
#include "mojo/public/cpp/bindings/array_traits.h"
-#include "third_party/WebKit/Source/platform/wtf/Vector.h"
+#include "third_party/blink/renderer/platform/wtf/vector.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/lib/string_traits_wtf.cc b/mojo/public/cpp/bindings/lib/string_traits_wtf.cc
index a58bb1b235..71b758c49c 100644
--- a/mojo/public/cpp/bindings/lib/string_traits_wtf.cc
+++ b/mojo/public/cpp/bindings/lib/string_traits_wtf.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "mojo/public/cpp/bindings/lib/array_internal.h"
#include "mojo/public/cpp/bindings/string_data_view.h"
-#include "third_party/WebKit/Source/platform/wtf/text/StringUTF8Adaptor.h"
+#include "third_party/blink/renderer/platform/wtf/text/string_utf8_adaptor.h"
namespace mojo {
namespace {
diff --git a/mojo/public/cpp/bindings/lib/wtf_clone_equals_util.h b/mojo/public/cpp/bindings/lib/wtf_clone_equals_util.h
index d801dafb75..2a3bef2592 100644
--- a/mojo/public/cpp/bindings/lib/wtf_clone_equals_util.h
+++ b/mojo/public/cpp/bindings/lib/wtf_clone_equals_util.h
@@ -9,10 +9,10 @@
#include "mojo/public/cpp/bindings/clone_traits.h"
#include "mojo/public/cpp/bindings/equals_traits.h"
-#include "third_party/WebKit/Source/platform/wtf/HashMap.h"
-#include "third_party/WebKit/Source/platform/wtf/Optional.h"
-#include "third_party/WebKit/Source/platform/wtf/Vector.h"
-#include "third_party/WebKit/Source/platform/wtf/text/WTFString.h"
+#include "third_party/blink/renderer/platform/wtf/hash_map.h"
+#include "third_party/blink/renderer/platform/wtf/optional.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
+#include "third_party/blink/renderer/platform/wtf/vector.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/lib/wtf_hash_util.h b/mojo/public/cpp/bindings/lib/wtf_hash_util.h
index 509b7cf8bd..fa02262e8e 100644
--- a/mojo/public/cpp/bindings/lib/wtf_hash_util.h
+++ b/mojo/public/cpp/bindings/lib/wtf_hash_util.h
@@ -9,9 +9,9 @@
#include "mojo/public/cpp/bindings/lib/hash_util.h"
#include "mojo/public/cpp/bindings/struct_ptr.h"
-#include "third_party/WebKit/Source/platform/wtf/HashFunctions.h"
-#include "third_party/WebKit/Source/platform/wtf/text/StringHash.h"
-#include "third_party/WebKit/Source/platform/wtf/text/WTFString.h"
+#include "third_party/blink/renderer/platform/wtf/hash_functions.h"
+#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace mojo {
namespace internal {
diff --git a/mojo/public/cpp/bindings/map_traits_wtf_hash_map.h b/mojo/public/cpp/bindings/map_traits_wtf_hash_map.h
index 128350ff54..32deab7aae 100644
--- a/mojo/public/cpp/bindings/map_traits_wtf_hash_map.h
+++ b/mojo/public/cpp/bindings/map_traits_wtf_hash_map.h
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "mojo/public/cpp/bindings/map_traits.h"
-#include "third_party/WebKit/Source/platform/wtf/HashMap.h"
+#include "third_party/blink/renderer/platform/wtf/hash_map.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/string_traits_wtf.h b/mojo/public/cpp/bindings/string_traits_wtf.h
index 4f0de4890f..51601d1ab8 100644
--- a/mojo/public/cpp/bindings/string_traits_wtf.h
+++ b/mojo/public/cpp/bindings/string_traits_wtf.h
@@ -7,7 +7,7 @@
#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
#include "mojo/public/cpp/bindings/string_traits.h"
-#include "third_party/WebKit/Source/platform/wtf/text/WTFString.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/tests/wtf_hash_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_hash_unittest.cc
index aaf1c1077d..458df2c9f1 100644
--- a/mojo/public/cpp/bindings/tests/wtf_hash_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/wtf_hash_unittest.cc
@@ -7,7 +7,7 @@
#include "mojo/public/interfaces/bindings/tests/test_structs.mojom-blink.h"
#include "mojo/public/interfaces/bindings/tests/test_wtf_types.mojom-blink.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/Source/platform/wtf/HashFunctions.h"
+#include "third_party/blink/renderer/platform/wtf/hash_functions.h"
namespace mojo {
namespace test {
diff --git a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
index d0dc9b0722..223e4c0bd7 100644
--- a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
@@ -14,7 +14,7 @@
#include "mojo/public/interfaces/bindings/tests/test_wtf_types.mojom-blink.h"
#include "mojo/public/interfaces/bindings/tests/test_wtf_types.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/Source/platform/wtf/text/StringHash.h"
+#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
namespace mojo {
namespace test {
diff --git a/mojo/public/tools/bindings/blink_bindings_configuration.gni b/mojo/public/tools/bindings/blink_bindings_configuration.gni
index a6edb9746d..2825b314a7 100644
--- a/mojo/public/tools/bindings/blink_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/blink_bindings_configuration.gni
@@ -8,9 +8,9 @@ for_blink = true
_typemap_imports = [
"//mojo/public/cpp/bindings/tests/blink_typemaps.gni",
- "//third_party/WebKit/Source/platform/mojo/blink_typemaps.gni",
- "//third_party/WebKit/public/blink_typemaps.gni",
- "//third_party/WebKit/public/public_typemaps.gni",
+ "//third_party/blink/renderer/platform/mojo/blink_typemaps.gni",
+ "//third_party/blink/public/blink_typemaps.gni",
+ "//third_party/blink/public/public_typemaps.gni",
]
_typemaps = []
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
index 88de1d659e..19804b4dd6 100644
--- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -43,8 +43,8 @@ _typemap_imports = [
"//services/viz/privileged/interfaces/compositing/typemaps.gni",
"//services/viz/public/cpp/compositing/typemaps.gni",
"//skia/public/interfaces/typemaps.gni",
- "//third_party/WebKit/common/typemaps.gni",
- "//third_party/WebKit/public/public_typemaps.gni",
+ "//third_party/blink/common/typemaps.gni",
+ "//third_party/blink/public/public_typemaps.gni",
"//ui/accessibility/mojom/typemaps.gni",
"//ui/base/mojo/typemaps.gni",
"//ui/display/mojo/typemaps.gni",
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
index c05568741c..f1b22bf7a0 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
@@ -69,10 +69,10 @@ namespace {{variant}} {
every use of {Inlined}StructPtr. #}
#include "mojo/public/cpp/bindings/lib/wtf_clone_equals_util.h"
#include "mojo/public/cpp/bindings/lib/wtf_hash_util.h"
-#include "third_party/WebKit/Source/platform/mojo/RevocableInterfacePtr.h"
-#include "third_party/WebKit/Source/platform/wtf/HashFunctions.h"
-#include "third_party/WebKit/Source/platform/wtf/Optional.h"
-#include "third_party/WebKit/Source/platform/wtf/text/WTFString.h"
+#include "third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h"
+#include "third_party/blink/renderer/platform/wtf/hash_functions.h"
+#include "third_party/blink/renderer/platform/wtf/optional.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
{%- endif %}
{% if not disallow_interfaces -%}
@@ -85,7 +85,7 @@ namespace {{variant}} {
#include "mojo/public/cpp/bindings/raw_ptr_impl_ref_traits.h"
#include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h"
{%- if for_blink %}
-#include "third_party/WebKit/Source/platform/mojo/RevocableInterfacePtr.h"
+#include "third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h"
{%- endif %}
{%- endif %}