| 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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); | 590 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); |
| 591 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; | 591 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; |
| 592 navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem; | 592 navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem; |
| 593 navigationInfo.isHistoryNavigationInNewChildFrame = isHistoryNavigationInNew
ChildFrame; | 593 navigationInfo.isHistoryNavigationInNewChildFrame = isHistoryNavigationInNew
ChildFrame; |
| 594 navigationInfo.isClientRedirect = isClientRedirect; | 594 navigationInfo.isClientRedirect = isClientRedirect; |
| 595 | 595 |
| 596 WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigat
ion(navigationInfo); | 596 WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigat
ion(navigationInfo); |
| 597 return static_cast<NavigationPolicy>(webPolicy); | 597 return static_cast<NavigationPolicy>(webPolicy); |
| 598 } | 598 } |
| 599 | 599 |
| 600 bool FrameLoaderClientImpl::hasPendingNavigation() | |
| 601 { | |
| 602 if (!m_webFrame->client()) | |
| 603 return false; | |
| 604 | |
| 605 return m_webFrame->client()->hasPendingNavigation(); | |
| 606 } | |
| 607 | |
| 608 void FrameLoaderClientImpl::dispatchWillSendSubmitEvent(HTMLFormElement* form) | 600 void FrameLoaderClientImpl::dispatchWillSendSubmitEvent(HTMLFormElement* form) |
| 609 { | 601 { |
| 610 if (m_webFrame->client()) | 602 if (m_webFrame->client()) |
| 611 m_webFrame->client()->willSendSubmitEvent(WebFormElement(form)); | 603 m_webFrame->client()->willSendSubmitEvent(WebFormElement(form)); |
| 612 } | 604 } |
| 613 | 605 |
| 614 void FrameLoaderClientImpl::dispatchWillSubmitForm(HTMLFormElement* form) | 606 void FrameLoaderClientImpl::dispatchWillSubmitForm(HTMLFormElement* form) |
| 615 { | 607 { |
| 616 if (m_webFrame->client()) | 608 if (m_webFrame->client()) |
| 617 m_webFrame->client()->willSubmitForm(WebFormElement(form)); | 609 m_webFrame->client()->willSubmitForm(WebFormElement(form)); |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 return m_webFrame->client()->getEffectiveConnectionType(); | 1029 return m_webFrame->client()->getEffectiveConnectionType(); |
| 1038 return WebEffectiveConnectionType::TypeUnknown; | 1030 return WebEffectiveConnectionType::TypeUnknown; |
| 1039 } | 1031 } |
| 1040 | 1032 |
| 1041 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() | 1033 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() |
| 1042 { | 1034 { |
| 1043 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); | 1035 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); |
| 1044 } | 1036 } |
| 1045 | 1037 |
| 1046 } // namespace blink | 1038 } // namespace blink |
| OLD | NEW |