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 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1410 { | 1410 { |
1411 Frame* parentFrame = m_frame->tree().parent(); | 1411 Frame* parentFrame = m_frame->tree().parent(); |
1412 if (!parentFrame) | 1412 if (!parentFrame) |
1413 return SecurityContext::InsecureRequestsDoNotUpgrade; | 1413 return SecurityContext::InsecureRequestsDoNotUpgrade; |
1414 | 1414 |
1415 // FIXME: We need a way to propagate insecure requests policy flags to | 1415 // FIXME: We need a way to propagate insecure requests policy flags to |
1416 // out-of-process frames. For now, we'll always use default behavior. | 1416 // out-of-process frames. For now, we'll always use default behavior. |
1417 if (!parentFrame->isLocalFrame()) | 1417 if (!parentFrame->isLocalFrame()) |
1418 return SecurityContext::InsecureRequestsDoNotUpgrade; | 1418 return SecurityContext::InsecureRequestsDoNotUpgrade; |
1419 | 1419 |
1420 ASSERT(toLocalFrame(parentFrame)->document()); | |
1420 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy(); | 1421 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy(); |
1421 } | 1422 } |
1422 | 1423 |
1424 SecurityContext::InsecureNavigationsSet* FrameLoader::insecureNavigationsToUpgra de() const | |
1425 { | |
1426 ASSERT(m_frame); | |
1427 Frame* parentFrame = m_frame->tree().parent(); | |
1428 if (!parentFrame) | |
1429 return nullptr; | |
1430 | |
1431 // FIXME: We need a way to propagate insecure requests policy flags to | |
1432 // out-of-process frames. For now, we'll always use default behavior. | |
1433 if (!parentFrame->isLocalFrame()) | |
1434 return nullptr; | |
1435 | |
1436 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; | |
Yoav Weiss
2015/03/18 09:48:35
Yeah, obviously parentFrame should have a document
| |
1437 } | |
1438 | |
1423 } // namespace blink | 1439 } // namespace blink |
OLD | NEW |