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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 712183002: Navigation transitions (web to native app): Hide/Show transition elements (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 OnSetCompositionFromExistingText) 931 OnSetCompositionFromExistingText)
932 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest) 932 IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest)
933 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest, 933 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest,
934 OnJavaScriptExecuteRequest) 934 OnJavaScriptExecuteRequest)
935 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests, 935 IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests,
936 OnJavaScriptExecuteRequestForTests) 936 OnJavaScriptExecuteRequestForTests)
937 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, 937 IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets,
938 OnSetEditableSelectionOffsets) 938 OnSetEditableSelectionOffsets)
939 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) 939 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView)
940 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) 940 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition)
941 IPC_MESSAGE_HANDLER(FrameMsg_HideTransitionElements,
942 OnHideTransitionElements)
943 IPC_MESSAGE_HANDLER(FrameMsg_ShowTransitionElements,
944 OnShowTransitionElements)
941 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) 945 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload)
942 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, 946 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest,
943 OnTextSurroundingSelectionRequest) 947 OnTextSurroundingSelectionRequest)
944 IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL, 948 IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL,
945 OnAddStyleSheetByURL) 949 OnAddStyleSheetByURL)
946 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, 950 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode,
947 OnSetAccessibilityMode) 951 OnSetAccessibilityMode)
948 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) 952 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener)
949 IPC_MESSAGE_HANDLER(FrameMsg_RequestNavigation, OnRequestNavigation) 953 IPC_MESSAGE_HANDLER(FrameMsg_RequestNavigation, OnRequestNavigation)
950 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation) 954 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation)
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 void RenderFrameImpl::OnSetupTransitionView(const std::string& markup) { 1490 void RenderFrameImpl::OnSetupTransitionView(const std::string& markup) {
1487 frame_->document().setIsTransitionDocument(); 1491 frame_->document().setIsTransitionDocument();
1488 frame_->navigateToSandboxedMarkup(WebData(markup.data(), markup.length())); 1492 frame_->navigateToSandboxedMarkup(WebData(markup.data(), markup.length()));
1489 } 1493 }
1490 1494
1491 void RenderFrameImpl::OnBeginExitTransition(const std::string& css_selector) { 1495 void RenderFrameImpl::OnBeginExitTransition(const std::string& css_selector) {
1492 frame_->document().setIsTransitionDocument(); 1496 frame_->document().setIsTransitionDocument();
1493 frame_->document().beginExitTransition(WebString::fromUTF8(css_selector)); 1497 frame_->document().beginExitTransition(WebString::fromUTF8(css_selector));
1494 } 1498 }
1495 1499
1500 void RenderFrameImpl::OnHideTransitionElements(
1501 const std::string& css_selector) {
1502 frame_->document().setIsTransitionDocument();
1503 frame_->document().hideTransitionElements(WebString::fromUTF8(css_selector));
1504 }
1505
1506 void RenderFrameImpl::OnShowTransitionElements(
1507 const std::string& css_selector) {
1508 frame_->document().setIsTransitionDocument();
1509 frame_->document().showTransitionElements(WebString::fromUTF8(css_selector));
1510 }
1511
1496 bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type, 1512 bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type,
1497 const base::string16& message, 1513 const base::string16& message,
1498 const base::string16& default_value, 1514 const base::string16& default_value,
1499 const GURL& frame_url, 1515 const GURL& frame_url,
1500 base::string16* result) { 1516 base::string16* result) {
1501 // Don't allow further dialogs if we are waiting to swap out, since the 1517 // Don't allow further dialogs if we are waiting to swap out, since the
1502 // PageGroupLoadDeferrer in our stack prevents it. 1518 // PageGroupLoadDeferrer in our stack prevents it.
1503 if (render_view()->suppress_dialogs_until_swap_out_) 1519 if (render_view()->suppress_dialogs_until_swap_out_)
1504 return false; 1520 return false;
1505 1521
(...skipping 2692 matching lines...) Expand 10 before | Expand all | Expand 10 after
4198 4214
4199 #if defined(ENABLE_BROWSER_CDMS) 4215 #if defined(ENABLE_BROWSER_CDMS)
4200 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4216 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4201 if (!cdm_manager_) 4217 if (!cdm_manager_)
4202 cdm_manager_ = new RendererCdmManager(this); 4218 cdm_manager_ = new RendererCdmManager(this);
4203 return cdm_manager_; 4219 return cdm_manager_;
4204 } 4220 }
4205 #endif // defined(ENABLE_BROWSER_CDMS) 4221 #endif // defined(ENABLE_BROWSER_CDMS)
4206 4222
4207 } // namespace content 4223 } // namespace content
OLDNEW
« 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