Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1631)

Unified Diff: Source/web/FrameLoaderClientImpl.cpp

Issue 721973002: Navigation transitions (web to native app): Get names and rects of transition elements (Step 4) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: review fix Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/FrameLoaderClientImpl.cpp
diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp
index 4939407368f217e85a77e0ae07ad5b45808b3472..21da5cf3f3103033e6995053ca4c64548731711e 100644
--- a/Source/web/FrameLoaderClientImpl.cpp
+++ b/Source/web/FrameLoaderClientImpl.cpp
@@ -490,19 +490,13 @@ void FrameLoaderClientImpl::dispatchAddNavigationTransitionData(const Document::
if (!m_webFrame->client())
return;
- // FIXME: change to use WebTransitionElementData after the chrome side is done.
- Vector<String> ids;
- Vector<IntRect> rects;
+ WebVector<WebTransitionElement> webElements(data.elements.size());
for (size_t i = 0; i < data.elements.size(); ++i) {
- ids.append(data.elements[i].id);
- rects.append(data.elements[i].rect);
+ webElements[i].id = data.elements[i].id;
+ webElements[i].rect = data.elements[i].rect;
}
- m_webFrame->client()->addNavigationTransitionData(
- WebString(data.scope),
- WebString(data.selector),
- WebString(data.markup),
- WebVector<WebString>(ids),
- WebVector<WebRect>(rects));
+ WebTransitionElementData webData(data.scope, data.selector, data.markup, webElements);
+ m_webFrame->client()->addNavigationTransitionData(webData);
}
void FrameLoaderClientImpl::dispatchWillRequestResource(FetchRequest* request)
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698