Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 732b914d631de55a19c54de6a3ac371453b881aa..f118bea198b7c125b0dd1e9ba41b58b56e52301f 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -731,6 +731,8 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { |
| OnJavaScriptExecuteRequest) |
| IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets, |
| OnSetEditableSelectionOffsets) |
| + IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
| + IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
| IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
| IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, |
| OnTextSurroundingSelectionRequest) |
| @@ -1245,6 +1247,16 @@ void RenderFrameImpl::OnAddStyleSheetByURL(const std::string& url) { |
| frame_->addStyleSheetByURL(WebString::fromUTF8(url)); |
| } |
| +void RenderFrameImpl::OnSetupTransitionView(const std::string& markup) { |
| + frame_->document().setIsTransitionDocument(); |
| + frame_->navigateToSandboxedMarkup(WebData(markup.data(), markup.length())); |
|
nasko
2014/08/04 13:36:48
Why not use c_str()? data() doesn't guarantee null
oystein (OOO til 10th of July)
2014/08/05 19:02:49
Hm I don't see how WebData can expect that, when i
|
| +} |
| + |
| +void RenderFrameImpl::OnBeginExitTransition(const std::string& css_selector) { |
| + frame_->document().setIsTransitionDocument(); |
| + frame_->document().beginExitTransition(WebString::fromUTF8(css_selector)); |
| +} |
| + |
| bool RenderFrameImpl::ShouldUpdateSelectionTextFromContextMenuParams( |
| const base::string16& selection_text, |
| size_t selection_text_offset, |
| @@ -2233,6 +2245,14 @@ void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { |
| render_view_->didUpdateCurrentHistoryItem(frame); |
| } |
| +void RenderFrameImpl::addNavigationTransitionData( |
| + const blink::WebString& origin, |
| + const blink::WebString& selector, |
| + const blink::WebString& markup) { |
| + Send(new FrameHostMsg_AddNavigationTransitionData( |
| + routing_id_, origin.utf8(), selector.utf8(), markup.utf8())); |
| +} |
| + |
| void RenderFrameImpl::didChangeThemeColor() { |
| if (frame_->parent()) |
| return; |