summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryutak <yutak@chromium.org>2017-04-14 03:10:13 +0900
committerQijiang Fan <fqj@google.com>2020-06-05 05:50:28 +0900
commit5ed5dec9c3444073ab9936020c4d880baa8143bb (patch)
tree9228d5ae161b80498fb84cbb804f6774f61a5408
parent9429925249ef0a14e3ec1af7f5e62aac7db112c9 (diff)
downloadlibchrome-5ed5dec9c3444073ab9936020c4d880baa8143bb.tar.gz
Rewrite references to "wtf/" to "platform/wtf/" in //mojo.
WTF library in Blink is moving from Source/wtf/ to Source/platform/wtf/. This patch updates the code affected by this change in //mojo. The actual content of the WTF headers is already moved to the new location, so this patch should be a no-op. BUG=691465 Review-Url: https://codereview.chromium.org/2817903002 Cr-Commit-Position: refs/heads/master@{#464470} CrOS-Libchrome-Original-Commit: 0ac72abc3d14dd04cec439fcee13b5b5e8b3fc0a
-rw-r--r--mojo/common/string16.mojom2
-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/generators/cpp_templates/module.h.tmpl6
10 files changed, 17 insertions, 17 deletions
diff --git a/mojo/common/string16.mojom b/mojo/common/string16.mojom
index 173c8670cd..08c39e7673 100644
--- a/mojo/common/string16.mojom
+++ b/mojo/common/string16.mojom
@@ -6,7 +6,7 @@ module mojo.common.mojom;
// Corresponds to |base::string16| in base/strings/string16.h
// Corresponds to |WTF::String| in
-// third_party/WebKit/Source/wtf/text/WTFString.h.
+// third_party/WebKit/Source/platform/wtf/text/WTFString.h.
struct String16 {
array<uint16> data;
};
diff --git a/mojo/public/cpp/bindings/array_traits_wtf_vector.h b/mojo/public/cpp/bindings/array_traits_wtf_vector.h
index 2aea2c47e8..d95cd2e209 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/wtf/Vector.h"
+#include "third_party/WebKit/Source/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 3bda50f18e..c128ecffc2 100644
--- a/mojo/public/cpp/bindings/lib/string_traits_wtf.cc
+++ b/mojo/public/cpp/bindings/lib/string_traits_wtf.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "mojo/public/cpp/bindings/lib/array_internal.h"
-#include "third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h"
+#include "third_party/WebKit/Source/platform/wtf/text/StringUTF8Adaptor.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 cb24bc46ee..07f969dd84 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/lib/equals_traits.h"
-#include "third_party/WebKit/Source/wtf/HashMap.h"
-#include "third_party/WebKit/Source/wtf/Optional.h"
-#include "third_party/WebKit/Source/wtf/Vector.h"
-#include "third_party/WebKit/Source/wtf/text/WTFString.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"
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 d4cd505c71..509b7cf8bd 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/wtf/HashFunctions.h"
-#include "third_party/WebKit/Source/wtf/text/StringHash.h"
-#include "third_party/WebKit/Source/wtf/text/WTFString.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"
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 ef01466be3..1f0ccf0e74 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/wtf/HashMap.h"
+#include "third_party/WebKit/Source/platform/wtf/HashMap.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/string_traits_wtf.h b/mojo/public/cpp/bindings/string_traits_wtf.h
index 8a9dc888b0..4f0de4890f 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/wtf/text/WTFString.h"
+#include "third_party/WebKit/Source/platform/wtf/text/WTFString.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 04f14b5cef..9ee97c3c2f 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/wtf/HashFunctions.h"
+#include "third_party/WebKit/Source/platform/wtf/HashFunctions.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 4c4819550c..b0ce91860f 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/wtf/text/StringHash.h"
+#include "third_party/WebKit/Source/platform/wtf/text/StringHash.h"
namespace mojo {
namespace test {
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 0ef6b25b25..9cb28d4eac 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
@@ -73,9 +73,9 @@ namespace {{variant}} {
{# hash_util.h includes template specializations that should be present for
every use of {Inlined}StructPtr. #}
#include "mojo/public/cpp/bindings/lib/wtf_hash_util.h"
-#include "third_party/WebKit/Source/wtf/HashFunctions.h"
-#include "third_party/WebKit/Source/wtf/Optional.h"
-#include "third_party/WebKit/Source/wtf/text/WTFString.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"
{%- endif %}
{%- for header in extra_public_headers %}