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 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1058 // The caller must protect a reference to m_frame. | 1058 // The caller must protect a reference to m_frame. |
1059 ASSERT(m_frame->refCount() > 1); | 1059 ASSERT(m_frame->refCount() > 1); |
1060 #endif | 1060 #endif |
1061 if (m_documentLoader) | 1061 if (m_documentLoader) |
1062 m_documentLoader->detachFromFrame(); | 1062 m_documentLoader->detachFromFrame(); |
1063 m_documentLoader = nullptr; | 1063 m_documentLoader = nullptr; |
1064 | 1064 |
1065 Frame* parent = m_frame->tree().parent(); | 1065 Frame* parent = m_frame->tree().parent(); |
1066 if (parent && parent->isLocalFrame()) | 1066 if (parent && parent->isLocalFrame()) |
1067 toLocalFrame(parent)->loader().scheduleCheckCompleted(); | 1067 toLocalFrame(parent)->loader().scheduleCheckCompleted(); |
1068 m_progressTracker->dispose(); | 1068 if (m_progressTracker) { |
1069 m_progressTracker.clear(); | 1069 m_progressTracker->dispose(); |
| 1070 m_progressTracker.clear(); |
| 1071 } |
1070 setOpener(0); | 1072 setOpener(0); |
1071 } | 1073 } |
1072 | 1074 |
1073 void FrameLoader::receivedMainResourceError(DocumentLoader* loader, const Resour
ceError& error) | 1075 void FrameLoader::receivedMainResourceError(DocumentLoader* loader, const Resour
ceError& error) |
1074 { | 1076 { |
1075 // Retain because the stop may release the last reference to it. | 1077 // Retain because the stop may release the last reference to it. |
1076 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); | 1078 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); |
1077 RefPtrWillBeRawPtr<DocumentLoader> protectDocumentLoader(loader); | 1079 RefPtrWillBeRawPtr<DocumentLoader> protectDocumentLoader(loader); |
1078 | 1080 |
1079 // FIXME: We really ought to be able to just check for isCancellation() here
, but there are some | 1081 // FIXME: We really ought to be able to just check for isCancellation() here
, but there are some |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1411 | 1413 |
1412 // FIXME: We need a way to propagate insecure content policy flags to | 1414 // FIXME: We need a way to propagate insecure content policy flags to |
1413 // out-of-process frames. For now, we'll always use default behavior. | 1415 // out-of-process frames. For now, we'll always use default behavior. |
1414 if (!parentFrame->isLocalFrame()) | 1416 if (!parentFrame->isLocalFrame()) |
1415 return SecurityContext::InsecureContentDoNotUpgrade; | 1417 return SecurityContext::InsecureContentDoNotUpgrade; |
1416 | 1418 |
1417 return toLocalFrame(parentFrame)->document()->insecureContentPolicy(); | 1419 return toLocalFrame(parentFrame)->document()->insecureContentPolicy(); |
1418 } | 1420 } |
1419 | 1421 |
1420 } // namespace blink | 1422 } // namespace blink |
OLD | NEW |