Experiment with typemaps in Blink Modules

third_party/WebKit/Source/modules/background_fetch/BackgroundFetchTypeConverters.cpp

Index: third_party/WebKit/Source/modules/background_fetch/BackgroundFetchTypeConverters.cpp
diff --git a/third_party/WebKit/Source/modules/background_fetch/BackgroundFetchTypeConverters.cpp b/third_party/WebKit/Source/modules/background_fetch/BackgroundFetchTypeConverters.cpp
index 54f0c422e3fb3abed772c324e0b464d10f62e912..23a22e7f766cc3906a3e6b38b4bc35d4ccf5f0e1 100644
--- a/third_party/WebKit/Source/modules/background_fetch/BackgroundFetchTypeConverters.cpp
+++ b/third_party/WebKit/Source/modules/background_fetch/BackgroundFetchTypeConverters.cpp
@@ -21,8 +21,8 @@ TypeConverter<blink::BackgroundFetchRegistration*,
   blink::HeapVector<blink::IconDefinition> icons;
   icons.reserveInitialCapacity(mojoRegistration->icons.size());
 
-  for (const auto& iconPtr : mojoRegistration->icons)
-    icons.push_back(iconPtr.To<blink::IconDefinition>());
+  for (const blink::IconDefinition& icon : mojoRegistration->icons)
+    icons.push_back(icon);
 
   return new blink::BackgroundFetchRegistration(
       mojoRegistration->tag, std::move(icons),
@@ -36,11 +36,11 @@ blink::mojom::blink::BackgroundFetchOptionsPtr TypeConverter<
   blink::mojom::blink::BackgroundFetchOptionsPtr mojoOptions =
       blink::mojom::blink::BackgroundFetchOptions::New();
 
-  WTF::Vector<blink::mojom::blink::IconDefinitionPtr> mojoIcons;
+  WTF::Vector<blink::IconDefinition> mojoIcons;

[Peter Beverloo, 2017/03/23 19:47:46]

This is where it fails, and it happens in the generated
background_fetch.mojom-blink.cc too. Traced objects, i.e. both dictionaries and
interfaces, can't be stored in regular WTF::Vectors<> due to the following
static_assert:

Vector.h:1273:3: error: static_assert failed "Cannot put
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW objects that have trace methods into an
off-heap Vector"
  static_assert(Allocator::isGarbageCollected ||
  ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

[haraken, 2017/03/24 02:09:18]

Can we just use a HeapVector?

Also I think we should just fix the mojo-binding generator to generate a
HeapVector when the vector contents are garbage collected objects.

   mojoIcons.reserveInitialCapacity(options.icons().size());
 
-  for (const auto& icon : options.icons())
-    mojoIcons.push_back(blink::mojom::blink::IconDefinition::From(icon));
+  for (const blink::IconDefinition& icon : options.icons())
+    mojoIcons.push_back(icon);
 
   mojoOptions->icons = std::move(mojoIcons);
   mojoOptions->total_download_size = options.totalDownloadSize();
@@ -49,27 +49,4 @@ blink::mojom::blink::BackgroundFetchOptionsPtr TypeConverter<
   return mojoOptions;
 }
 
-blink::IconDefinition
-TypeConverter<blink::IconDefinition, blink::mojom::blink::IconDefinitionPtr>::
-    Convert(const blink::mojom::blink::IconDefinitionPtr& mojoDefinition) {
-  blink::IconDefinition definition;
-  definition.setSrc(mojoDefinition->src);
-  definition.setSizes(mojoDefinition->sizes);
-  definition.setType(mojoDefinition->type);
-
-  return definition;
-}
-
-blink::mojom::blink::IconDefinitionPtr TypeConverter<
-    blink::mojom::blink::IconDefinitionPtr,
-    blink::IconDefinition>::Convert(const blink::IconDefinition& definition) {
-  blink::mojom::blink::IconDefinitionPtr mojoDefinition =
-      blink::mojom::blink::IconDefinition::New();
-  mojoDefinition->src = definition.src();
-  mojoDefinition->sizes = definition.sizes();
-  mojoDefinition->type = definition.type();
-
-  return mojoDefinition;
-}
-
 }  // namespace mojo