| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 9 * | 9 * |
| 10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
| (...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 896 | 896 |
| 897 if (m_inStopAllLoaders) | 897 if (m_inStopAllLoaders) |
| 898 return; | 898 return; |
| 899 | 899 |
| 900 if (m_frame->page()->defersLoading() && isBackForwardLoadType(frameLoadType)
) { | 900 if (m_frame->page()->defersLoading() && isBackForwardLoadType(frameLoadType)
) { |
| 901 m_deferredHistoryLoad = DeferredHistoryLoad::create(passedRequest.resour
ceRequest(), historyItem, frameLoadType, historyLoadType); | 901 m_deferredHistoryLoad = DeferredHistoryLoad::create(passedRequest.resour
ceRequest(), historyItem, frameLoadType, historyLoadType); |
| 902 return; | 902 return; |
| 903 } | 903 } |
| 904 | 904 |
| 905 FrameLoadRequest request(passedRequest); | 905 FrameLoadRequest request(passedRequest); |
| 906 request.resourceRequest().setHasUserGesture(UserGestureIndicator::processing
UserGesture()); | 906 request.resourceRequest().setHasUserGesture(UserGestureIndicator::processing
UserGestureUntracked()); |
| 907 | 907 |
| 908 if (!prepareRequestForThisFrame(request)) | 908 if (!prepareRequestForThisFrame(request)) |
| 909 return; | 909 return; |
| 910 | 910 |
| 911 RawPtr<Frame> targetFrame = request.form() ? nullptr : m_frame->findFrameFor
Navigation(AtomicString(request.frameName()), *m_frame); | 911 RawPtr<Frame> targetFrame = request.form() ? nullptr : m_frame->findFrameFor
Navigation(AtomicString(request.frameName()), *m_frame); |
| 912 | 912 |
| 913 if (isBackForwardLoadType(frameLoadType)) { | 913 if (isBackForwardLoadType(frameLoadType)) { |
| 914 ASSERT(historyItem); | 914 ASSERT(historyItem); |
| 915 m_provisionalItem = historyItem; | 915 m_provisionalItem = historyItem; |
| 916 } | 916 } |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1584 // FIXME: We need a way to propagate insecure requests policy flags to | 1584 // FIXME: We need a way to propagate insecure requests policy flags to |
| 1585 // out-of-process frames. For now, we'll always use default behavior. | 1585 // out-of-process frames. For now, we'll always use default behavior. |
| 1586 if (!parentFrame->isLocalFrame()) | 1586 if (!parentFrame->isLocalFrame()) |
| 1587 return nullptr; | 1587 return nullptr; |
| 1588 | 1588 |
| 1589 ASSERT(toLocalFrame(parentFrame)->document()); | 1589 ASSERT(toLocalFrame(parentFrame)->document()); |
| 1590 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1590 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
| 1591 } | 1591 } |
| 1592 | 1592 |
| 1593 } // namespace blink | 1593 } // namespace blink |
| OLD | NEW |