Commit 361b9434 authored by Dmitry Gozman's avatar Dmitry Gozman Committed by Commit Bot

Blink: do not generate blink variant for public_typemaps

Public typemaps may use non-wtf types, since they are consumed by embedder.
Generating blink variant for them fails. One example would be a manifest
typemap which currently resides in content, but will be moved to blink.

Those typemaps which can be used inside blink (and are used already)
are added to blink_typemaps instead. These are usually enum typemaps
and can be shared verbatim between variants.

Bug: none
Change-Id: Ifd969c6de92e6e0507b40b2426e0b33119ea599b
Reviewed-on: https://chromium-review.googlesource.com/1015228Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552844}
parent a0adee2a
...@@ -10,7 +10,6 @@ _typemap_imports = [ ...@@ -10,7 +10,6 @@ _typemap_imports = [
"//mojo/public/cpp/bindings/tests/blink_typemaps.gni", "//mojo/public/cpp/bindings/tests/blink_typemaps.gni",
"//third_party/blink/renderer/platform/mojo/blink_typemaps.gni", "//third_party/blink/renderer/platform/mojo/blink_typemaps.gni",
"//third_party/blink/public/blink_typemaps.gni", "//third_party/blink/public/blink_typemaps.gni",
"//third_party/blink/public/public_typemaps.gni",
] ]
_typemaps = [] _typemaps = []
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# These are typemaps which are shared between Blink public and its embedder. # These are typemaps which are exposed by Blink to its embedder.
typemaps = [ typemaps = [
"//third_party/blink/public/platform/content_security_policy.typemap", "//third_party/blink/public/platform/content_security_policy.typemap",
"//third_party/blink/public/platform/display_mode.typemap", "//third_party/blink/public/platform/display_mode.typemap",
......
...@@ -17,7 +17,9 @@ typemaps = [ ...@@ -17,7 +17,9 @@ typemaps = [
"//third_party/blink/renderer/platform/mojo/security_origin.typemap", "//third_party/blink/renderer/platform/mojo/security_origin.typemap",
"//third_party/blink/renderer/platform/mojo/string.typemap", "//third_party/blink/renderer/platform/mojo/string.typemap",
"//third_party/blink/renderer/platform/mojo/time.typemap", "//third_party/blink/renderer/platform/mojo/time.typemap",
"//third_party/blink/public/platform/display_mode.typemap",
"//third_party/blink/public/platform/modules/bluetooth/bluetooth.typemap", "//third_party/blink/public/platform/modules/bluetooth/bluetooth.typemap",
"//third_party/blink/public/platform/modules/fetch/fetch_api_request.typemap", "//third_party/blink/public/platform/modules/fetch/fetch_api_request.typemap",
"//third_party/blink/public/platform/modules/notifications/notification_types.typemap", "//third_party/blink/public/platform/modules/notifications/notification_types.typemap",
"//third_party/blink/public/common/screen_orientation/screen_orientation_lock_types.typemap",
] ]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment