Remove Navigation Transitions from Chromium

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 1041 matching lines @@
     IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest,
                         OnJavaScriptExecuteRequest)
     IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests,
                         OnJavaScriptExecuteRequestForTests)
     IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestInIsolatedWorld,
                         OnJavaScriptExecuteRequestInIsolatedWorld)
     IPC_MESSAGE_HANDLER(FrameMsg_VisualStateRequest,
                         OnVisualStateRequest)
     IPC_MESSAGE_HANDLER(FrameMsg_SetEditableSelectionOffsets,
                         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,
-                        OnShowTransitionElements)
     IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload)
     IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest,
                         OnTextSurroundingSelectionRequest)
-    IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL,
-                        OnAddStyleSheetByURL)
     IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode,
                         OnSetAccessibilityMode)
     IPC_MESSAGE_HANDLER(AccessibilityMsg_SnapshotTree,
                         OnSnapshotAccessibilityTree)
     IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener)
     IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation)
     IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
     IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
                         OnTextTrackSettingsChanged)
     IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent)
@@ skipping 648 matching lines @@
     return;
   }
 
   Send(new FrameHostMsg_TextSurroundingSelectionResponse(
       routing_id_,
       surroundingText.textContent(),
       surroundingText.startOffsetInTextContent(),
       surroundingText.endOffsetInTextContent()));
 }
 
-void RenderFrameImpl::OnAddStyleSheetByURL(const std::string& url) {
-  frame_->addStyleSheetByURL(WebString::fromUTF8(url));
-}
-
-void RenderFrameImpl::OnSetupTransitionView(const std::string& markup) {
-  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(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().hideTransitionElements(WebString::fromUTF8(css_selector));
-}
-
-void RenderFrameImpl::OnShowTransitionElements(
-    const std::string& css_selector) {
-  frame_->document().showTransitionElements(WebString::fromUTF8(css_selector));
-}
-
 bool RenderFrameImpl::RunJavaScriptMessage(JavaScriptMessageType type,
                                            const base::string16& message,
                                            const base::string16& default_value,
                                            const GURL& frame_url,
                                            base::string16* result) {
   // Don't allow further dialogs if we are waiting to swap out, since the
   // PageGroupLoadDeferrer in our stack prevents it.
   if (render_view()->suppress_dialogs_until_swap_out_)
     return false;
 
@@ skipping 733 matching lines @@
                                          SERVICE_WORKER_PROVIDER_FOR_WINDOW));
     ServiceWorkerNetworkProvider::AttachToDocumentState(
         DocumentState::FromDataSource(datasource),
         network_provider.Pass());
   }
 }
 
 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
                                               bool is_transition_navigation,
                                               double triggering_event_time) {
+  didStartProvisionalLoad(frame, triggering_event_time);
+}
+
+void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
+                                              double triggering_event_time) {
   DCHECK(!frame_ || frame_ == frame);
   WebDataSource* ds = frame->provisionalDataSource();
 
   // In fast/loader/stop-provisional-loads.html, we abort the load before this
   // callback is invoked.
   if (!ds)
     return;
 
   TRACE_EVENT2("navigation", "RenderFrameImpl::didStartProvisionalLoad",
                "id", routing_id_, "url", ds->request().url().string().utf8());
@@ skipping 24 matching lines @@
     // handle loading of error pages.
     static_cast<NavigationStateImpl*>(document_state->navigation_state())
         ->set_transition_type(ui::PAGE_TRANSITION_AUTO_SUBFRAME);
   }
 
   FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
                     DidStartProvisionalLoad(frame));
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidStartProvisionalLoad());
 
   Send(new FrameHostMsg_DidStartProvisionalLoadForFrame(
-       routing_id_, ds->request().url(), is_transition_navigation));
+       routing_id_, ds->request().url()));
 }
 
 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
     blink::WebLocalFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
   render_view_->history_controller()->RemoveChildrenForRedirect(this);
 }
 
 void RenderFrameImpl::didFailProvisionalLoad(
     blink::WebLocalFrame* frame,
@@ skipping 365 matching lines @@
   didCommitProvisionalLoad(frame, item, commit_type);
 }
 
 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
   // TODO(nasko): Move implementation here. Needed methods:
   // * StartNavStateSyncTimerIfNecessary
   render_view_->didUpdateCurrentHistoryItem(frame);
 }
 
-void RenderFrameImpl::addNavigationTransitionData(
-    const blink::WebTransitionElementData& data) {
-  FrameHostMsg_AddNavigationTransitionData_Params params;
-  params.render_frame_id = routing_id_;
-  params.allowed_destination_host_pattern =
-      data.scope.utf8();
-  params.selector = data.selector.utf8();
-  params.markup = data.markup.utf8();
-  params.elements.resize(data.elements.size());
-  for (size_t i = 0; i < data.elements.size(); i++) {
-    params.elements[i].id = data.elements[i].id.utf8();
-    params.elements[i].rect = gfx::Rect(data.elements[i].rect);
-  }
-
-  Send(new FrameHostMsg_AddNavigationTransitionData(params));
-}
-
 void RenderFrameImpl::didChangeThemeColor() {
   if (frame_->parent())
     return;
 
   Send(new FrameHostMsg_DidChangeThemeColor(
       routing_id_, frame_->document().themeColor()));
 }
 
 void RenderFrameImpl::dispatchLoad() {
   Send(new FrameHostMsg_DispatchLoad(routing_id_));
@@ skipping 1139 matching lines @@
     return;
   }
 
   GetContentClient()->SetActiveURL(common_params.url);
 
   pending_navigation_params_.reset(new NavigationParams(
       common_params, StartNavigationParams(), request_params));
 
   // Inform the browser of the start of the provisional load. This is needed so
   // that the load is properly tracked by the WebNavigation API.
-  // TODO(clamy): Properly set is_transition_navigation.
   Send(new FrameHostMsg_DidStartProvisionalLoadForFrame(
-      routing_id_, common_params.url, false));
+      routing_id_, common_params.url));
 
   // Send the provisional load failure.
   blink::WebURLError error =
       CreateWebURLError(common_params.url, has_stale_copy_in_cache, error_code);
   WebURLRequest failed_request = CreateURLRequestForNavigation(
       common_params, scoped_ptr<StreamOverrideParameters>(),
       frame_->isViewSourceModeEnabled());
   SendFailedProvisionalLoad(failed_request, error, frame_);
 
   if (!ShouldDisplayErrorPageForFailedLoad(error_code, common_params.url)) {
@@ skipping 821 matching lines @@
 #elif defined(ENABLE_BROWSER_CDMS)
         cdm_manager_,
 #endif
         this);
   }
 
   return cdm_factory_;
 }
 
 }  // namespace content