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 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1394 return false; | 1394 return false; |
1395 | 1395 |
1396 // FIXME: We need a way to propagate strict mixed content checking flags to | 1396 // FIXME: We need a way to propagate strict mixed content checking flags to |
1397 // out-of-process frames. For now, we'll always enforce. | 1397 // out-of-process frames. For now, we'll always enforce. |
1398 if (!parentFrame->isLocalFrame()) | 1398 if (!parentFrame->isLocalFrame()) |
1399 return true; | 1399 return true; |
1400 | 1400 |
1401 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten
tChecking(); | 1401 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten
tChecking(); |
1402 } | 1402 } |
1403 | 1403 |
1404 SecurityContext::InsecureContentPolicy FrameLoader::insecureContentPolicy() cons
t | 1404 SecurityContext::InsecureRequestsPolicy FrameLoader::insecureRequestsPolicy() co
nst |
1405 { | 1405 { |
1406 Frame* parentFrame = m_frame->tree().parent(); | 1406 Frame* parentFrame = m_frame->tree().parent(); |
1407 if (!parentFrame) | 1407 if (!parentFrame) |
1408 return SecurityContext::InsecureContentDoNotUpgrade; | 1408 return SecurityContext::InsecureRequestsDoNotUpgrade; |
1409 | 1409 |
1410 // FIXME: We need a way to propagate insecure content policy flags to | 1410 // FIXME: We need a way to propagate insecure requests policy flags to |
1411 // out-of-process frames. For now, we'll always use default behavior. | 1411 // out-of-process frames. For now, we'll always use default behavior. |
1412 if (!parentFrame->isLocalFrame()) | 1412 if (!parentFrame->isLocalFrame()) |
1413 return SecurityContext::InsecureContentDoNotUpgrade; | 1413 return SecurityContext::InsecureRequestsDoNotUpgrade; |
1414 | 1414 |
1415 return toLocalFrame(parentFrame)->document()->insecureContentPolicy(); | 1415 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy(); |
1416 } | 1416 } |
1417 | 1417 |
1418 } // namespace blink | 1418 } // namespace blink |
OLD | NEW |