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 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1060 // trigger event listeners for 'abort'. These event listeners might detach | 1060 // trigger event listeners for 'abort'. These event listeners might detach |
1061 // the frame. | 1061 // the frame. |
1062 // TODO(dcheng): Investigate if this can be moved above the check that | 1062 // TODO(dcheng): Investigate if this can be moved above the check that |
1063 // m_provisionalDocumentLoader hasn't changed. | 1063 // m_provisionalDocumentLoader hasn't changed. |
1064 if (!m_frame->client()) | 1064 if (!m_frame->client()) |
1065 return false; | 1065 return false; |
1066 // No more events will be dispatched so detach the Document. | 1066 // No more events will be dispatched so detach the Document. |
1067 if (m_frame->document()) | 1067 if (m_frame->document()) |
1068 m_frame->document()->detach(); | 1068 m_frame->document()->detach(); |
1069 m_documentLoader = m_provisionalDocumentLoader.release(); | 1069 m_documentLoader = m_provisionalDocumentLoader.release(); |
1070 | 1070 m_frame->updateFrameSecurityOrigin(); |
| 1071 |
1071 return true; | 1072 return true; |
1072 } | 1073 } |
1073 | 1074 |
1074 void FrameLoader::commitProvisionalLoad() | 1075 void FrameLoader::commitProvisionalLoad() |
1075 { | 1076 { |
1076 ASSERT(client()->hasWebView()); | 1077 ASSERT(client()->hasWebView()); |
1077 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); | 1078 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); |
1078 | 1079 |
1079 // Check if the destination page is allowed to access the previous page's ti
ming information. | 1080 // Check if the destination page is allowed to access the previous page's ti
ming information. |
1080 if (m_frame->document()) { | 1081 if (m_frame->document()) { |
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1517 // FIXME: We need a way to propagate insecure requests policy flags to | 1518 // FIXME: We need a way to propagate insecure requests policy flags to |
1518 // out-of-process frames. For now, we'll always use default behavior. | 1519 // out-of-process frames. For now, we'll always use default behavior. |
1519 if (!parentFrame->isLocalFrame()) | 1520 if (!parentFrame->isLocalFrame()) |
1520 return nullptr; | 1521 return nullptr; |
1521 | 1522 |
1522 ASSERT(toLocalFrame(parentFrame)->document()); | 1523 ASSERT(toLocalFrame(parentFrame)->document()); |
1523 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1524 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
1524 } | 1525 } |
1525 | 1526 |
1526 } // namespace blink | 1527 } // namespace blink |
OLD | NEW |