| Index: content/browser/transition_request_manager.cc
|
| diff --git a/content/browser/transition_request_manager.cc b/content/browser/transition_request_manager.cc
|
| index b863991c7195c16003fb94706a49abd682806818..3c281abba4957840e107aeabb3656016f1eef9a7 100644
|
| --- a/content/browser/transition_request_manager.cc
|
| +++ b/content/browser/transition_request_manager.cc
|
| @@ -86,13 +86,11 @@ TransitionRequestManager::TransitionRequestData::AllowedEntry::AllowedEntry(
|
| const std::string& allowed_destination_host_pattern,
|
| const std::string& css_selector,
|
| const std::string& markup,
|
| - const std::vector<std::string>& names,
|
| - const std::vector<gfx::Rect>& rects)
|
| + const std::vector<TransitionElement>& elements)
|
| : allowed_destination_host_pattern(allowed_destination_host_pattern),
|
| css_selector(css_selector),
|
| markup(markup),
|
| - names(names),
|
| - rects(rects) {
|
| + elements(elements) {
|
| }
|
|
|
| TransitionRequestManager::TransitionRequestData::AllowedEntry::~AllowedEntry() {
|
| @@ -129,13 +127,11 @@ void TransitionRequestManager::TransitionRequestData::AddEntry(
|
| const std::string& allowed_destination_host_pattern,
|
| const std::string& css_selector,
|
| const std::string& markup,
|
| - const std::vector<std::string>& names,
|
| - const std::vector<gfx::Rect>& rects) {
|
| + const std::vector<TransitionElement>& elements) {
|
| allowed_entries_.push_back(AllowedEntry(allowed_destination_host_pattern,
|
| css_selector,
|
| markup,
|
| - names,
|
| - rects));
|
| + elements));
|
| }
|
|
|
| bool TransitionRequestManager::TransitionRequestData::FindEntry(
|
| @@ -153,8 +149,7 @@ bool TransitionRequestManager::TransitionRequestData::FindEntry(
|
| const AllowedEntry& allowed_entry = allowed_entries_[0];
|
| transition_data->markup = allowed_entry.markup;
|
| transition_data->css_selector = allowed_entry.css_selector;
|
| - transition_data->names = allowed_entry.names;
|
| - transition_data->rects = allowed_entry.rects;
|
| + transition_data->elements = allowed_entry.elements;
|
| return true;
|
| }
|
|
|
| @@ -178,13 +173,12 @@ void TransitionRequestManager::AddPendingTransitionRequestData(
|
| const std::string& allowed_destination_host_pattern,
|
| const std::string& css_selector,
|
| const std::string& markup,
|
| - const std::vector<std::string>& names,
|
| - const std::vector<gfx::Rect>& rects) {
|
| + const std::vector<TransitionElement>& elements) {
|
| 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, names, rects);
|
| + allowed_destination_host_pattern, css_selector, markup, elements);
|
| }
|
|
|
| void TransitionRequestManager::AddPendingTransitionRequestDataForTesting(
|
| @@ -197,8 +191,7 @@ void TransitionRequestManager::AddPendingTransitionRequestDataForTesting(
|
| "*", /* allowed_destination_host_pattern */
|
| "", /* css_selector */
|
| "", /* markup */
|
| - std::vector<std::string>(), /* names */
|
| - std::vector<gfx::Rect>()); /* rects */
|
| + std::vector<TransitionElement>()); /* elements */
|
| }
|
|
|
| void TransitionRequestManager::ClearPendingTransitionRequestData(
|
|
|