| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 // we do not want to use a history item for it.) | 587 // we do not want to use a history item for it.) |
| 588 bool isHistoryNavigationInNewChildFrame = m_webFrame->parent() | 588 bool isHistoryNavigationInNewChildFrame = m_webFrame->parent() |
| 589 && m_webFrame->parent()->isWebLocalFrame() | 589 && m_webFrame->parent()->isWebLocalFrame() |
| 590 && isBackForwardLoadType(toWebLocalFrameImpl(m_webFrame->parent())->fram
e()->loader().loadType()) | 590 && isBackForwardLoadType(toWebLocalFrameImpl(m_webFrame->parent())->fram
e()->loader().loadType()) |
| 591 && !toWebLocalFrameImpl(m_webFrame->parent())->frame()->document()->load
EventFinished(); | 591 && !toWebLocalFrameImpl(m_webFrame->parent())->frame()->document()->load
EventFinished(); |
| 592 | 592 |
| 593 WrappedResourceRequest wrappedResourceRequest(request); | 593 WrappedResourceRequest wrappedResourceRequest(request); |
| 594 WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest); | 594 WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest); |
| 595 navigationInfo.navigationType = static_cast<WebNavigationType>(type); | 595 navigationInfo.navigationType = static_cast<WebNavigationType>(type); |
| 596 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); | 596 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); |
| 597 navigationInfo.extraData = ds ? ds->extraData() : nullptr; | 597 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; |
| 598 navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem; | 598 navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem; |
| 599 navigationInfo.isHistoryNavigationInNewChildFrame = isHistoryNavigationInNew
ChildFrame; | 599 navigationInfo.isHistoryNavigationInNewChildFrame = isHistoryNavigationInNew
ChildFrame; |
| 600 navigationInfo.isClientRedirect = isClientRedirect; | 600 navigationInfo.isClientRedirect = isClientRedirect; |
| 601 | 601 |
| 602 WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigat
ion(navigationInfo); | 602 WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigat
ion(navigationInfo); |
| 603 return static_cast<NavigationPolicy>(webPolicy); | 603 return static_cast<NavigationPolicy>(webPolicy); |
| 604 } | 604 } |
| 605 | 605 |
| 606 bool FrameLoaderClientImpl::hasPendingNavigation() | 606 bool FrameLoaderClientImpl::hasPendingNavigation() |
| 607 { | 607 { |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 | 1023 |
| 1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
| 1025 { | 1025 { |
| 1026 if (m_webFrame->client()) { | 1026 if (m_webFrame->client()) { |
| 1027 m_webFrame->client()->suddenTerminationDisablerChanged( | 1027 m_webFrame->client()->suddenTerminationDisablerChanged( |
| 1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
| 1029 } | 1029 } |
| 1030 } | 1030 } |
| 1031 | 1031 |
| 1032 } // namespace blink | 1032 } // namespace blink |
| OLD | NEW |