diff options
| author | zhenw <zhenw@chromium.org> | 2014-11-07 11:25:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 19:25:57 +0000 |
| commit | 9fb0481da9c5a809052611df341796c9cb6367d4 (patch) | |
| tree | 876cd7e542c7f4637ff2644079a00c56884c6f9d /content/browser/transition_browsertest.cc | |
| parent | caa8c58cb570091ea27d8d75a406022ef8e0e82d (diff) | |
| download | chromium_src-9fb0481da9c5a809052611df341796c9cb6367d4.zip chromium_src-9fb0481da9c5a809052611df341796c9cb6367d4.tar.gz chromium_src-9fb0481da9c5a809052611df341796c9cb6367d4.tar.bz2 | |
Navigation transitions (web to native app): Use TransitionElement struct to pass data
In the original CL 652953008, the layout test failed because transition elements were got on UI thread in navigator_impl.cc. This CL passes the data to TransitionRequestManager with TransitionElement struct, but defers passing transition elements to TransitionPageHelper on Java side. So navigator does not need to get the transition elements during navigation. And the Java side will fetch the transition elements later.
ref: https://codereview.chromium.org/652953008
BUG=370696
Review URL: https://codereview.chromium.org/698043002
Cr-Commit-Position: refs/heads/master@{#303270}
Diffstat (limited to 'content/browser/transition_browsertest.cc')
| -rw-r--r-- | content/browser/transition_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/transition_browsertest.cc b/content/browser/transition_browsertest.cc index 147e771..1fba073 100644 --- a/content/browser/transition_browsertest.cc +++ b/content/browser/transition_browsertest.cc @@ -86,7 +86,7 @@ class TransitionBrowserTestObserver ResourceRequestInfoImpl::ForRequest(request_); TransitionLayerData transition_data; did_clear_data_ = !TransitionRequestManager::GetInstance( - )->HasPendingTransitionRequest(info->GetChildID(), + )->GetPendingTransitionRequest(info->GetChildID(), info->GetRenderFrameID(), request_->url(), &transition_data); |