Reland "Migrate URL and Origin typemaps to GN definitions"

This is a reland of 1b21e379

Unmodified from the original, which was reverted
to revert a preceding change.

Original change's description:
> Migrate URL and Origin typemaps to GN definitions
>
> Also moves some longer bits of code out-of-line.
>
> Bug: 1059389
> Change-Id: Idd1b3606e26504ab92e9aefebc933823919a2431
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092695
> Commit-Queue: Ken Rockot <rockot@google.com>
> Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#748058}

Bug: 1059389
Change-Id: Ifd8edc62b361cd5947e6161758ce310c2c912556
Tbr: dcheng@chromium.org
Tbr: dtapuska@chromium.org
Nopresubmit: True
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095943
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#748735}

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -61,7 +61,6 @@ _typemap_imports = [
   "//ui/gfx/typemaps.gni",
   "//ui/gl/typemaps.gni",
   "//ui/latency/mojom/typemaps.gni",
-  "//url/mojom/typemaps.gni",
 ]
 
 _typemaps = []

third_party/blink/renderer/platform/mojo/BUILD.gn

@@ -18,3 +18,38 @@ mojom_cpp_typemap("big_string_typemap") {
   ]
   public_deps = [ "//mojo/public/cpp/base" ]
 }
+
+mojom_cpp_typemap("url_typemap") {
+  types = [
+    {
+      mojom = "url.mojom.Url"
+      cpp = "::blink::KURL"
+      force_serialize = true
+    },
+  ]
+  public_headers = [
+    "//third_party/blink/renderer/platform/mojo/kurl_mojom_traits.h",
+    "//third_party/blink/renderer/platform/weborigin/kurl.h",
+    "//third_party/blink/renderer/platform/weborigin/kurl_hash.h",
+  ]
+
+  # NOTE: Consumers of this typemap must themselves depend on platform.
+  public_deps = [ "//url" ]
+}
+
+mojom_cpp_typemap("origin_typemap") {
+  types = [
+    {
+      mojom = "url.mojom.Origin"
+      cpp = "::scoped_refptr<const ::blink::SecurityOrigin>"
+      nullable_is_same_type = true
+    },
+  ]
+  public_headers = [
+    "//third_party/blink/renderer/platform/mojo/security_origin_mojom_traits.h",
+    "//third_party/blink/renderer/platform/weborigin/security_origin.h",
+  ]
+
+  # NOTE: Consumers of this typemap must themselves depend on platform.
+  public_deps = [ "//url" ]
+}

third_party/blink/renderer/platform/mojo/blink_typemaps.gni

@@ -22,8 +22,6 @@ typemaps = [
   "//third_party/blink/renderer/platform/blob/serialized_blob.typemap",
   "//third_party/blink/renderer/platform/cookie/canonical_cookie.typemap",
   "//third_party/blink/renderer/platform/mojo/fetch_api_request_headers.typemap",
-  "//third_party/blink/renderer/platform/mojo/kurl.typemap",
-  "//third_party/blink/renderer/platform/mojo/security_origin.typemap",
   "//third_party/blink/renderer/platform/mojo/string.typemap",
   "//third_party/blink/renderer/platform/mojo/time.typemap",
   "//third_party/blink/renderer/platform/network/encoded_form_data_element.typemap",

third_party/blink/renderer/platform/mojo/kurl.typemap

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//url/mojom/url.mojom"
-public_headers = [
-  "//third_party/blink/renderer/platform/weborigin/kurl.h",
-  "//third_party/blink/renderer/platform/weborigin/kurl_hash.h",
-]
-traits_headers =
-    [ "//third_party/blink/renderer/platform/mojo/kurl_mojom_traits.h" ]
-
-# Note: consumers of this typemap must themselves depend on platform.
-deps = [
-  "//mojo/public/cpp/bindings",
-  "//url",
-]
-type_mappings = [ "url.mojom.Url=::blink::KURL[force_serialize]" ]

third_party/blink/renderer/platform/mojo/kurl_mojom_traits.h

@@ -5,15 +5,16 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_KURL_MOJOM_TRAITS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_KURL_MOJOM_TRAITS_H_
 
+#include "mojo/public/cpp/bindings/string_traits_wtf.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-#include "url/mojom/url.mojom-blink-forward.h"
+#include "url/mojom/url.mojom-shared.h"
 #include "url/url_constants.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<url::mojom::blink::Url::DataView, ::blink::KURL> {
+struct StructTraits<url::mojom::UrlDataView, ::blink::KURL> {
   static WTF::String url(const ::blink::KURL& blinkUrl) {
     if (!blinkUrl.IsValid() ||
         blinkUrl.GetString().length() > url::kMaxURLChars) {
@@ -22,7 +23,7 @@ struct StructTraits<url::mojom::blink::Url::DataView, ::blink::KURL> {
 
     return blinkUrl.GetString();
   }
-  static bool Read(url::mojom::blink::Url::DataView data, ::blink::KURL* out) {
+  static bool Read(url::mojom::UrlDataView data, ::blink::KURL* out) {
     WTF::String urlString;
     if (!data.ReadUrl(&urlString))
       return false;

third_party/blink/renderer/platform/mojo/security_origin.typemap

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//url/mojom/origin.mojom"
-public_headers =
-    [ "//third_party/blink/renderer/platform/weborigin/security_origin.h" ]
-traits_headers = [
-  "//third_party/blink/renderer/platform/mojo/security_origin_mojom_traits.h",
-]
-
-# Note: consumers of this typemap must themselves depend on platform.
-deps = [
-  "//mojo/public/cpp/bindings",
-  "//url",
-]
-type_mappings = [ "url.mojom.Origin=::scoped_refptr<const ::blink::SecurityOrigin>[nullable_is_same_type]" ]

third_party/blink/renderer/platform/mojo/security_origin_mojom_traits.h

@@ -5,10 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_SECURITY_ORIGIN_MOJOM_TRAITS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_SECURITY_ORIGIN_MOJOM_TRAITS_H_
 
+#include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
+#include "mojo/public/cpp/bindings/string_traits_wtf.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/weborigin/security_origin.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-#include "url/mojom/origin.mojom-blink-forward.h"
+#include "url/mojom/origin.mojom-shared.h"
 #include "url/scheme_host_port.h"
 
 namespace mojo {
@@ -45,7 +47,7 @@ struct UrlOriginAdapter {
 };
 
 template <>
-struct StructTraits<url::mojom::blink::Origin::DataView,
+struct StructTraits<url::mojom::OriginDataView,
                     scoped_refptr<const ::blink::SecurityOrigin>> {
   static WTF::String scheme(
       const scoped_refptr<const ::blink::SecurityOrigin>& origin) {
@@ -65,7 +67,7 @@ struct StructTraits<url::mojom::blink::Origin::DataView,
       const scoped_refptr<const ::blink::SecurityOrigin>& origin) {
     return UrlOriginAdapter::nonce_if_opaque(origin);
   }
-  static bool Read(url::mojom::blink::Origin::DataView data,
+  static bool Read(url::mojom::OriginDataView data,
                    scoped_refptr<const ::blink::SecurityOrigin>* out) {
     // This implementation is very close to
     // SecurityOrigin::CreateFromUrlOrigin, so keep in sync if modifications

url/mojom/BUILD.gn

@@ -7,6 +7,9 @@ import("//mojo/public/tools/bindings/mojom.gni")
 mojom("url_mojom_gurl") {
   generate_java = true
   sources = [ "url.mojom" ]
+  cpp_typemaps = [ ":url_typemap" ]
+  blink_cpp_typemaps =
+      [ "//third_party/blink/renderer/platform/mojo:url_typemap" ]
 }
 
 mojom("url_mojom_origin") {
@@ -19,6 +22,10 @@ mojom("url_mojom_origin") {
   ]
 
   check_includes_blink = false
+
+  cpp_typemaps = [ ":origin_typemap" ]
+  blink_cpp_typemaps =
+      [ "//third_party/blink/renderer/platform/mojo:origin_typemap" ]
 }
 
 mojom("test_url_mojom_gurl") {
@@ -29,3 +36,58 @@ mojom("test_url_mojom_gurl") {
     ":url_mojom_origin",
   ]
 }
+
+component("mojom_traits") {
+  output_name = "url_mojom_traits"
+
+  sources = [
+    "origin_mojom_traits.cc",
+    "origin_mojom_traits.h",
+    "url_gurl_mojom_traits.cc",
+    "url_gurl_mojom_traits.h",
+  ]
+
+  defines = [ "IS_URL_MOJOM_TRAITS_IMPL" ]
+
+  public_deps = [
+    ":url_mojom_gurl_shared",
+    ":url_mojom_origin_shared",
+    "//base",
+    "//mojo/public/cpp/base:shared_typemap_traits",
+    "//url",
+  ]
+}
+
+mojom_cpp_typemap("url_typemap") {
+  types = [
+    {
+      mojom = "url.mojom.Url"
+      cpp = "::GURL"
+    },
+  ]
+  public_headers = [
+    "//url/gurl.h",
+    "//url/mojom/url_gurl_mojom_traits.h",
+  ]
+  public_deps = [
+    ":mojom_traits",
+    "//url",
+  ]
+}
+
+mojom_cpp_typemap("origin_typemap") {
+  types = [
+    {
+      mojom = "url.mojom.Origin"
+      cpp = "::url::Origin"
+    },
+  ]
+  public_headers = [
+    "//url/origin.h",
+    "//url/mojom/origin_mojom_traits.h",
+  ]
+  public_deps = [
+    ":mojom_traits",
+    "//url",
+  ]
+}

url/mojom/OWNERS

@@ -2,6 +2,4 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
 # COMPONENT: Internals>Mojo

url/mojom/gurl.typemap

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//url/mojom/url.mojom"
-public_headers = [ "//url/gurl.h" ]
-traits_headers = [ "//url/mojom/url_gurl_mojom_traits.h" ]
-deps = [
-  "//url",
-]
-type_mappings = [ "url.mojom.Url=::GURL" ]

url/mojom/origin.typemap

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//url/mojom/origin.mojom"
-public_headers = [ "//url/origin.h" ]
-traits_headers = [ "//url/mojom/origin_mojom_traits.h" ]
-deps = [
-  "//url",
-]
-type_mappings = [ "url.mojom.Origin=::url::Origin" ]

url/mojom/origin_mojom_traits.cc

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "url/mojom/origin_mojom_traits.h"
+
+#include "base/strings/string_piece.h"
+
+namespace mojo {
+
+// static
+bool StructTraits<url::mojom::OriginDataView, url::Origin>::Read(
+    url::mojom::OriginDataView data,
+    url::Origin* out) {
+  base::StringPiece scheme, host;
+  base::Optional<base::UnguessableToken> nonce_if_opaque;
+  if (!data.ReadScheme(&scheme) || !data.ReadHost(&host) ||
+      !data.ReadNonceIfOpaque(&nonce_if_opaque))
+    return false;
+
+  base::Optional<url::Origin> creation_result =
+      nonce_if_opaque
+          ? url::Origin::UnsafelyCreateOpaqueOriginWithoutNormalization(
+                scheme, host, data.port(), url::Origin::Nonce(*nonce_if_opaque))
+          : url::Origin::UnsafelyCreateTupleOriginWithoutNormalization(
+                scheme, host, data.port());
+  if (!creation_result)
+    return false;
+
+  *out = std::move(creation_result.value());
+  return true;
+}
+
+}  // namespace mojo

url/mojom/origin_mojom_traits.h

@@ -5,16 +5,18 @@
 #ifndef URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
 #define URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
 
-#include "base/strings/string_piece.h"
+#include "base/component_export.h"
+#include "base/optional.h"
 #include "base/unguessable_token.h"
 #include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
-#include "url/mojom/origin.mojom.h"
+#include "url/mojom/origin.mojom-shared.h"
 #include "url/origin.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<url::mojom::OriginDataView, url::Origin> {
+struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
+    StructTraits<url::mojom::OriginDataView, url::Origin> {
   static const std::string& scheme(const url::Origin& r) {
     return r.GetTupleOrPrecursorTupleIfOpaque().scheme();
   }
@@ -29,26 +31,7 @@ struct StructTraits<url::mojom::OriginDataView, url::Origin> {
     // TODO(nasko): Consider returning a const reference here.
     return r.GetNonceForSerialization();
   }
-  static bool Read(url::mojom::OriginDataView data, url::Origin* out) {
-    base::StringPiece scheme, host;
-    base::Optional<base::UnguessableToken> nonce_if_opaque;
-    if (!data.ReadScheme(&scheme) || !data.ReadHost(&host) ||
-        !data.ReadNonceIfOpaque(&nonce_if_opaque))
-      return false;
-
-    base::Optional<url::Origin> creation_result =
-        nonce_if_opaque
-            ? url::Origin::UnsafelyCreateOpaqueOriginWithoutNormalization(
-                  scheme, host, data.port(),
-                  url::Origin::Nonce(*nonce_if_opaque))
-            : url::Origin::UnsafelyCreateTupleOriginWithoutNormalization(
-                  scheme, host, data.port());
-    if (!creation_result)
-      return false;
-
-    *out = std::move(creation_result.value());
-    return true;
-  }
+  static bool Read(url::mojom::OriginDataView data, url::Origin* out);
 };
 
 }  // namespace mojo

url/mojom/typemaps.gni

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-typemaps = [
-  "//url/mojom/origin.typemap",
-  "//url/mojom/gurl.typemap",
-]

url/mojom/url_gurl_mojom_traits.cc

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "url/mojom/url_gurl_mojom_traits.h"
+
+#include "url/url_constants.h"
+
+namespace mojo {
+
+// static
+base::StringPiece StructTraits<url::mojom::UrlDataView, GURL>::url(
+    const GURL& r) {
+  if (r.possibly_invalid_spec().length() > url::kMaxURLChars || !r.is_valid()) {
+    return base::StringPiece();
+  }
+
+  return base::StringPiece(r.possibly_invalid_spec().c_str(),
+                           r.possibly_invalid_spec().length());
+}
+
+// static
+bool StructTraits<url::mojom::UrlDataView, GURL>::Read(
+    url::mojom::UrlDataView data,
+    GURL* out) {
+  base::StringPiece url_string;
+  if (!data.ReadUrl(&url_string))
+    return false;
+
+  if (url_string.length() > url::kMaxURLChars)
+    return false;
+
+  *out = GURL(url_string);
+  if (!url_string.empty() && !out->is_valid())
+    return false;
+
+  return true;
+}
+
+}  // namespace mojo

url/mojom/url_gurl_mojom_traits.h

@@ -5,38 +5,19 @@
 #ifndef URL_MOJOM_URL_GURL_MOJOM_TRAITS_H_
 #define URL_MOJOM_URL_GURL_MOJOM_TRAITS_H_
 
+#include "base/component_export.h"
 #include "base/strings/string_piece.h"
+#include "mojo/public/cpp/bindings/struct_traits.h"
 #include "url/gurl.h"
-#include "url/mojom/url.mojom.h"
-#include "url/url_constants.h"
+#include "url/mojom/url.mojom-shared.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<url::mojom::UrlDataView, GURL> {
-  static base::StringPiece url(const GURL& r) {
-    if (r.possibly_invalid_spec().length() > url::kMaxURLChars ||
-        !r.is_valid()) {
-      return base::StringPiece();
-    }
-
-    return base::StringPiece(r.possibly_invalid_spec().c_str(),
-                             r.possibly_invalid_spec().length());
-  }
-  static bool Read(url::mojom::UrlDataView data, GURL* out) {
-    base::StringPiece url_string;
-    if (!data.ReadUrl(&url_string))
-      return false;
-
-    if (url_string.length() > url::kMaxURLChars)
-      return false;
-
-    *out = GURL(url_string);
-    if (!url_string.empty() && !out->is_valid())
-      return false;
-
-    return true;
-  }
+struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
+    StructTraits<url::mojom::UrlDataView, GURL> {
+  static base::StringPiece url(const GURL& r);
+  static bool Read(url::mojom::UrlDataView data, GURL* out);
 };
 
 }  // namespace mojo