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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 775843004: Navigation transitions (web to native app): Revert exit transition (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 28ff2b4a4fa2608c9994235c5343cffa58da7c93..ad8915f1288ff6654ef34ac5f31ba46923b3e622 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -919,6 +919,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
OnSetEditableSelectionOffsets)
IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView)
IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition)
+ IPC_MESSAGE_HANDLER(FrameMsg_RevertExitTransition, OnRevertExitTransition)
IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements,
OnHideTransitionElements)
IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements,
@@ -1494,26 +1495,29 @@ void RenderFrameImpl::OnAddStyleSheetByURL(const std::string& url) {
}
void RenderFrameImpl::OnSetupTransitionView(const std::string& markup) {
- frame_->document().setIsTransitionDocument();
+ frame_->document().setIsTransitionDocument(true);
frame_->navigateToSandboxedMarkup(WebData(markup.data(), markup.length()));
}
void RenderFrameImpl::OnBeginExitTransition(const std::string& css_selector,
bool exit_to_native_app) {
- frame_->document().setIsTransitionDocument();
+ frame_->document().setIsTransitionDocument(true);
frame_->document().beginExitTransition(WebString::fromUTF8(css_selector),
exit_to_native_app);
}
+void RenderFrameImpl::OnRevertExitTransition() {
+ frame_->document().setIsTransitionDocument(false);
+ frame_->document().revertExitTransition();
+}
+
void RenderFrameImpl::OnHideTransitionElements(
const std::string& css_selector) {
- frame_->document().setIsTransitionDocument();
frame_->document().hideTransitionElements(WebString::fromUTF8(css_selector));
}
void RenderFrameImpl::OnShowTransitionElements(
const std::string& css_selector) {
- frame_->document().setIsTransitionDocument();
frame_->document().showTransitionElements(WebString::fromUTF8(css_selector));
}
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698