| 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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 | 545 |
| 546 WrappedResourceRequest wrappedResourceRequest(request); | 546 WrappedResourceRequest wrappedResourceRequest(request); |
| 547 WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest); | 547 WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest); |
| 548 navigationInfo.navigationType = static_cast<WebNavigationType>(type); | 548 navigationInfo.navigationType = static_cast<WebNavigationType>(type); |
| 549 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); | 549 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); |
| 550 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; | 550 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; |
| 551 navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem; | 551 navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem; |
| 552 navigationInfo.isHistoryNavigationInNewChildFrame = | 552 navigationInfo.isHistoryNavigationInNewChildFrame = |
| 553 isHistoryNavigationInNewChildFrame; | 553 isHistoryNavigationInNewChildFrame; |
| 554 navigationInfo.isClientRedirect = isClientRedirect; | 554 navigationInfo.isClientRedirect = isClientRedirect; |
| 555 // Caching could be disabled for requests initiated by DevTools. |
| 556 // TODO(ananta) |
| 557 // We should extract the network cache state into a global component which |
| 558 // can be queried here and wherever necessary. |
| 559 navigationInfo.isCacheDisabled = |
| 560 devToolsAgent() ? devToolsAgent()->cacheDisabled() : false; |
| 555 if (form) | 561 if (form) |
| 556 navigationInfo.form = WebFormElement(form); | 562 navigationInfo.form = WebFormElement(form); |
| 557 | 563 |
| 558 WebNavigationPolicy webPolicy = | 564 WebNavigationPolicy webPolicy = |
| 559 m_webFrame->client()->decidePolicyForNavigation(navigationInfo); | 565 m_webFrame->client()->decidePolicyForNavigation(navigationInfo); |
| 560 return static_cast<NavigationPolicy>(webPolicy); | 566 return static_cast<NavigationPolicy>(webPolicy); |
| 561 } | 567 } |
| 562 | 568 |
| 563 void FrameLoaderClientImpl::dispatchWillSendSubmitEvent(HTMLFormElement* form) { | 569 void FrameLoaderClientImpl::dispatchWillSendSubmitEvent(HTMLFormElement* form) { |
| 564 if (m_webFrame->client()) | 570 if (m_webFrame->client()) |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 992 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { | 998 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { |
| 993 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) | 999 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) |
| 994 ->devToolsAgentImpl(); | 1000 ->devToolsAgentImpl(); |
| 995 } | 1001 } |
| 996 | 1002 |
| 997 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1003 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 998 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1004 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 999 } | 1005 } |
| 1000 | 1006 |
| 1001 } // namespace blink | 1007 } // namespace blink |
| OLD | NEW |