| 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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 // Newly created child frames may need to be navigated to a history item | 522 // Newly created child frames may need to be navigated to a history item |
| 523 // during a back/forward navigation. This will only happen when the parent | 523 // during a back/forward navigation. This will only happen when the parent |
| 524 // is a LocalFrame doing a back/forward navigation that has not completed. | 524 // is a LocalFrame doing a back/forward navigation that has not completed. |
| 525 // (If the load has completed and the parent later adds a frame with script, | 525 // (If the load has completed and the parent later adds a frame with script, |
| 526 // we do not want to use a history item for it.) | 526 // we do not want to use a history item for it.) |
| 527 bool isHistoryNavigationInNewChildFrame = | 527 bool isHistoryNavigationInNewChildFrame = |
| 528 m_webFrame->parent() && m_webFrame->parent()->isWebLocalFrame() && | 528 m_webFrame->parent() && m_webFrame->parent()->isWebLocalFrame() && |
| 529 isBackForwardLoadType(toWebLocalFrameImpl(m_webFrame->parent()) | 529 isBackForwardLoadType(toWebLocalFrameImpl(m_webFrame->parent()) |
| 530 ->frame() | 530 ->frame() |
| 531 ->loader() | 531 ->loader() |
| 532 .loadType()) && | 532 .documentLoader() |
| 533 ->loadType()) && |
| 533 !toWebLocalFrameImpl(m_webFrame->parent()) | 534 !toWebLocalFrameImpl(m_webFrame->parent()) |
| 534 ->frame() | 535 ->frame() |
| 535 ->document() | 536 ->document() |
| 536 ->loadEventFinished(); | 537 ->loadEventFinished(); |
| 537 | 538 |
| 538 WrappedResourceRequest wrappedResourceRequest(request); | 539 WrappedResourceRequest wrappedResourceRequest(request); |
| 539 WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest); | 540 WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest); |
| 540 navigationInfo.navigationType = static_cast<WebNavigationType>(type); | 541 navigationInfo.navigationType = static_cast<WebNavigationType>(type); |
| 541 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); | 542 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); |
| 542 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; | 543 navigationInfo.extraData = ds ? ds->getExtraData() : nullptr; |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 998 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 999 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 999 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1000 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1000 } | 1001 } |
| 1001 | 1002 |
| 1002 void FrameLoaderClientImpl::setHasReceivedUserGesture() { | 1003 void FrameLoaderClientImpl::setHasReceivedUserGesture() { |
| 1003 if (m_webFrame->client()) | 1004 if (m_webFrame->client()) |
| 1004 m_webFrame->client()->setHasReceivedUserGesture(); | 1005 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1005 } | 1006 } |
| 1006 | 1007 |
| 1007 } // namespace blink | 1008 } // namespace blink |
| OLD | NEW |