Chromium Code Reviews| Index: Source/web/FrameLoaderClientImpl.cpp |
| diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp |
| index 686b8f4cdf7728c446ba95a9727fca17805c53b9..5b7b37c92cb74e31ddca511c712a9e17495235c5 100644 |
| --- a/Source/web/FrameLoaderClientImpl.cpp |
| +++ b/Source/web/FrameLoaderClientImpl.cpp |
| @@ -390,10 +390,10 @@ void FrameLoaderClientImpl::dispatchWillClose() |
| m_webFrame->client()->willClose(m_webFrame); |
| } |
| -void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad() |
| +void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(bool isTransitionNavigation) |
| { |
| if (m_webFrame->client()) |
| - m_webFrame->client()->didStartProvisionalLoad(m_webFrame); |
| + m_webFrame->client()->didStartProvisionalLoad(m_webFrame, isTransitionNavigation); |
| } |
| void FrameLoaderClientImpl::dispatchDidReceiveTitle(const String& title) |
| @@ -457,16 +457,25 @@ void FrameLoaderClientImpl::dispatchDidFirstVisuallyNonEmptyLayout() |
| m_webFrame->client()->didFirstVisuallyNonEmptyLayout(m_webFrame); |
| } |
| -NavigationPolicy FrameLoaderClientImpl::decidePolicyForNavigation(const ResourceRequest& request, DocumentLoader* loader, NavigationPolicy policy) |
| +NavigationPolicy FrameLoaderClientImpl::decidePolicyForNavigation(const ResourceRequest& request, DocumentLoader* loader, NavigationPolicy policy, bool isTransitionNavigation) |
| { |
| if (!m_webFrame->client()) |
| return NavigationPolicyIgnore; |
| WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(loader); |
| WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigation(m_webFrame, ds->extraData(), WrappedResourceRequest(request), |
| - ds->navigationType(), static_cast<WebNavigationPolicy>(policy), ds->isRedirect()); |
| + ds->navigationType(), static_cast<WebNavigationPolicy>(policy), ds->isRedirect(), isTransitionNavigation); |
| return static_cast<NavigationPolicy>(webPolicy); |
| } |
| +void FrameLoaderClientImpl::dispatchAddNavigationTransitionData(const String& origin, const String& markup) |
|
abarth-chromium
2014/06/13 17:18:31
I didn't track down where |origin| came from, but
oystein (OOO til 10th of July)
2014/06/18 00:04:08
My naming is bad; renamed to "allowedDestinationOr
|
| +{ |
| + WebViewImpl* webview = m_webFrame->viewImpl(); |
| + if (!webview->client()) |
| + return; |
| + |
| + webview->client()->addNavigationTransitionData(origin, markup); |
| +} |
| + |
| void FrameLoaderClientImpl::dispatchWillRequestResource(FetchRequest* request) |
| { |
| if (m_webFrame->client()) { |