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

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 2b8bcf0f6e9019f91f36b77e5f9a36f3ce3f46a3..69bfde5fb377f149c5b34ed1850382f83eb98de3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2434,13 +2434,41 @@ void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) {
   render_view_->didUpdateCurrentHistoryItem(frame);
 }
 
+// TODO(zhenw): This will be removed once the blink side implementation is done.
 void RenderFrameImpl::addNavigationTransitionData(
     const blink::WebString& allowed_destination_host_pattern,
     const blink::WebString& selector,
     const blink::WebString& markup) {
-  Send(new FrameHostMsg_AddNavigationTransitionData(
-      routing_id_, allowed_destination_host_pattern.utf8(), selector.utf8(),
-      markup.utf8()));
+  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();
+
+  Send(new FrameHostMsg_AddNavigationTransitionData(params));

[nasko, 2014/10/17 20:04:19]

There shouldn't be two methods that send IPCs, just call the other method with
the default params.

[Zhen Wang, 2014/10/17 21:34:29]

Are we ok to use default params? I heard somewhere else that we prefer not to
use default params.

Besides, this is a three-way patch involving both Chrome side and Blink side
changes as indicated in the CL description. At current stage, only this function
will Send IPC. After the blink side is done, only the below function will Send
IPC. And I will make a final CL to remove this function after both Chrome side
and Blink side are done. So at any time point, only one method will send IPC in
reality.

[nasko, 2014/10/20 14:14:18]

The pattern is to have one method that sends the IPC and all other methods call
it, supplying whatever values make sense for the extra parameters. In any case,
if you are removing the method immediately after, it is fine to leave it as is.

+}
+
+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) {
+  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();
+  for (size_t i = 0; i < web_names.size(); i++) {
+    params.names.push_back(web_names[i].utf8());
+  }
+  for (size_t i = 0; i < web_rects.size(); i++) {
+    params.rects.push_back(gfx::Rect(web_rects[i]));
+  }
+
+  Send(new FrameHostMsg_AddNavigationTransitionData(params));
 }
 
 void RenderFrameImpl::didChangeThemeColor() {