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

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 2416 matching lines @@
   didCommitProvisionalLoad(frame, item, commit_type);
 }
 
 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
   // TODO(nasko): Move implementation here. Needed methods:
   // * StartNavStateSyncTimerIfNecessary
   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) {
+  std::vector<std::string> data;
+  data.push_back(allowed_destination_host_pattern.utf8());

[nasko, 2014/10/14 23:09:51]

Do not collapse top-level parameters into a vector. They should remain separate
parameters. If you are exceeding the number of parameters in the IPC macros, use
a struct and describe that struct. There are plenty of examples to follow.

[Zhen Wang, 2014/10/15 18:22:12]

Done.

+  data.push_back(selector.utf8());
+  data.push_back(markup.utf8());
+
+  Send(new FrameHostMsg_AddNavigationTransitionData(
+      routing_id_, data, std::vector<std::string>(),
+      std::vector<gfx::Rect>()));
+}
+
 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_names,
+    const blink::WebVector<blink::WebRect>& web_rects) {
+  std::vector<std::string> data;
+  data.push_back(allowed_destination_host_pattern.utf8());
+  data.push_back(selector.utf8());
+  data.push_back(markup.utf8());
+
+  std::vector<std::string> names;
+  for (size_t i = 0; i < web_names.size(); i++) {
+    names.push_back(web_names[i].utf8());
+  }
+
+  std::vector<gfx::Rect> rects;
+  for (size_t i = 0; i < web_rects.size(); i++) {
+    rects.push_back(gfx::Rect(web_rects[i]));
+  }
+
   Send(new FrameHostMsg_AddNavigationTransitionData(
-      routing_id_, allowed_destination_host_pattern.utf8(), selector.utf8(),
-      markup.utf8()));
+      routing_id_, data, names, rects));
 }
 
 void RenderFrameImpl::didChangeThemeColor() {
   if (frame_->parent())
     return;
 
   Send(new FrameHostMsg_DidChangeThemeColor(
       routing_id_, frame_->document().themeColor()));
 }
 
@@ skipping 1520 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content