Navigation transitions (web to native app): Get names and rects of transition elements (Step 3)

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index abb8320f7210e424bb17b3b9ba545e271f62d67d..7d23a41e54ea4897861127b498eea355968a1643 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2562,33 +2562,36 @@ void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) {
 void RenderFrameImpl::addNavigationTransitionData(
     const blink::WebString& allowed_destination_host_pattern,
     const blink::WebString& selector,
-    const blink::WebString& markup) {
+    const blink::WebString& markup,
+    const blink::WebVector<blink::WebString>& web_ids,
+    const blink::WebVector<blink::WebRect>& web_rects) {
   FrameHostMsg_AddNavigationTransitionData_Params params;
   params.render_frame_id = routing_id_;
   params.allowed_destination_host_pattern =
       allowed_destination_host_pattern.utf8();
   params.selector = selector.utf8();
   params.markup = markup.utf8();
+  params.elements.resize(web_ids.size());
+  for (size_t i = 0; i < web_ids.size(); i++) {
+    params.elements[i].id = web_ids[i].utf8();
+    params.elements[i].rect = gfx::Rect(web_rects[i]);
+  }
 
   Send(new FrameHostMsg_AddNavigationTransitionData(params));
 }
 
 void RenderFrameImpl::addNavigationTransitionData(
-    const blink::WebString& allowed_destination_host_pattern,
-    const blink::WebString& selector,
-    const blink::WebString& markup,
-    const blink::WebVector<blink::WebString>& web_names,
-    const blink::WebVector<blink::WebRect>& web_rects) {
+    const blink::WebTransitionElementData& data) {
   FrameHostMsg_AddNavigationTransitionData_Params params;
   params.render_frame_id = routing_id_;
   params.allowed_destination_host_pattern =
-      allowed_destination_host_pattern.utf8();
-  params.selector = selector.utf8();
-  params.markup = markup.utf8();
-  params.elements.resize(web_names.size());
-  for (size_t i = 0; i < web_names.size(); i++) {
-    params.elements[i].name = web_names[i].utf8();
-    params.elements[i].rect = gfx::Rect(web_rects[i]);
+      data.scope.utf8();
+  params.selector = data.selector.utf8();
+  params.markup = data.markup.utf8();
+  params.elements.resize(data.elements.size());
+  for (size_t i = 0; i < data.elements.size(); i++) {
+    params.elements[i].id = data.elements[i].id.utf8();
+    params.elements[i].rect = gfx::Rect(data.elements[i].rect);
   }
 
   Send(new FrameHostMsg_AddNavigationTransitionData(params));