Revert of Navigation transitions (web to native app): Pass data after starting provisional load ...

content/browser/transition_request_manager.cc

 // Copyright 2014 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/browser/transition_request_manager.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_split.h"
@@ skipping 68 matching lines @@
 TransitionLayerData::TransitionLayerData() {
 }
 
 TransitionLayerData::~TransitionLayerData() {
 }
 
 TransitionRequestManager::TransitionRequestData::AllowedEntry::AllowedEntry(
     const std::string& allowed_destination_host_pattern,
     const std::string& css_selector,
     const std::string& markup,
-    const std::vector<TransitionElement>& elements)
+    const std::vector<std::string>& names,
+    const std::vector<gfx::Rect>& rects)
     : allowed_destination_host_pattern(allowed_destination_host_pattern),
       css_selector(css_selector),
       markup(markup),
-      elements(elements) {
+      names(names),
+      rects(rects) {
 }
 
 TransitionRequestManager::TransitionRequestData::AllowedEntry::~AllowedEntry() {
 }
 
 void TransitionRequestManager::ParseTransitionStylesheetsFromHeaders(
     const scoped_refptr<net::HttpResponseHeaders>& headers,
     std::vector<GURL>& entering_stylesheets,
     const GURL& resolve_address) {
   if (headers.get() == NULL)
@@ skipping 16 matching lines @@
 TransitionRequestManager::TransitionRequestData::TransitionRequestData() {
 }
 
 TransitionRequestManager::TransitionRequestData::~TransitionRequestData() {
 }
 
 void TransitionRequestManager::TransitionRequestData::AddEntry(
     const std::string& allowed_destination_host_pattern,
     const std::string& css_selector,
     const std::string& markup,
-    const std::vector<TransitionElement>& elements) {
+    const std::vector<std::string>& names,
+    const std::vector<gfx::Rect>& rects) {
   allowed_entries_.push_back(AllowedEntry(allowed_destination_host_pattern,
                                           css_selector,
                                           markup,
-                                          elements));
+                                          names,
+                                          rects));
 }
 
 bool TransitionRequestManager::TransitionRequestData::FindEntry(
     const GURL& request_url,
     TransitionLayerData* transition_data) {
   DCHECK(!allowed_entries_.empty());
   CHECK(transition_data);
   // TODO(oysteine): Add CSP check to validate the host pattern and the
   // request_url. Must be done before this feature is moved out from the flag.
   CHECK(CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableExperimentalWebPlatformFeatures) ||
             base::FieldTrialList::FindFullName("NavigationTransitions") ==
                 "Enabled");
 
   const AllowedEntry& allowed_entry = allowed_entries_[0];
   transition_data->markup = allowed_entry.markup;
   transition_data->css_selector = allowed_entry.css_selector;
-  transition_data->elements = allowed_entry.elements;
+  transition_data->names = allowed_entry.names;
+  transition_data->rects = allowed_entry.rects;
   return true;
 }
 
-bool TransitionRequestManager::GetPendingTransitionRequest(
+bool TransitionRequestManager::HasPendingTransitionRequest(
     int render_process_id,
     int render_frame_id,
     const GURL& request_url,
     TransitionLayerData* transition_data) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(transition_data);
   std::pair<int, int> key(render_process_id, render_frame_id);
   RenderFrameRequestDataMap::iterator iter =
       pending_transition_frames_.find(key);
   return iter != pending_transition_frames_.end() &&
       iter->second.FindEntry(request_url, transition_data);
 }
 
 void TransitionRequestManager::AddPendingTransitionRequestData(
     int render_process_id,
     int render_frame_id,
     const std::string& allowed_destination_host_pattern,
     const std::string& css_selector,
     const std::string& markup,
-    const std::vector<TransitionElement>& elements) {
+    const std::vector<std::string>& names,
+    const std::vector<gfx::Rect>& rects) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   std::pair<int, int> key(render_process_id, render_frame_id);
   pending_transition_frames_[key].AddEntry(
-      allowed_destination_host_pattern, css_selector, markup, elements);
+      allowed_destination_host_pattern, css_selector, markup, names, rects);
 }
 
 void TransitionRequestManager::AddPendingTransitionRequestDataForTesting(
     int render_process_id,
     int render_frame_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   std::pair<int, int> key(render_process_id, render_frame_id);
   pending_transition_frames_[key].AddEntry(
       "*", /* allowed_destination_host_pattern */
       "", /* css_selector */
       "", /* markup */
-      std::vector<TransitionElement>()); /* elements */
+      std::vector<std::string>(), /* names */
+      std::vector<gfx::Rect>()); /* rects */
 }
 
 void TransitionRequestManager::ClearPendingTransitionRequestData(
     int render_process_id, int render_frame_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   std::pair<int, int> key(render_process_id, render_frame_id);
   pending_transition_frames_.erase(key);
 }
 
 TransitionRequestManager::TransitionRequestManager() {
 }
 
 TransitionRequestManager::~TransitionRequestManager() {
 }
 
 // static
 TransitionRequestManager* TransitionRequestManager::GetInstance() {
   return Singleton<TransitionRequestManager>::get();
 }
 
 }  // namespace content