Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 811773002: Mixed Content: Implement strict mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 SandboxFlags flags = m_forcedSandboxFlags; 1432 SandboxFlags flags = m_forcedSandboxFlags;
1433 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1433 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1434 Frame* parentFrame = m_frame->tree().parent(); 1434 Frame* parentFrame = m_frame->tree().parent();
1435 if (parentFrame && parentFrame->isLocalFrame()) 1435 if (parentFrame && parentFrame->isLocalFrame())
1436 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1436 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1437 if (FrameOwner* frameOwner = m_frame->owner()) 1437 if (FrameOwner* frameOwner = m_frame->owner())
1438 flags |= frameOwner->sandboxFlags(); 1438 flags |= frameOwner->sandboxFlags();
1439 return flags; 1439 return flags;
1440 } 1440 }
1441 1441
1442 bool FrameLoader::shouldEnforceStrictMixedContentChecking() const
1443 {
1444 Frame* parentFrame = m_frame->tree().parent();
1445 if (!parentFrame)
1446 return false;
1447
1448 // FIXME: We need a way to propagate strict mixed content checking flags to
1449 // out-of-process frames. For now, we'll always enforce.
1450 if (!parentFrame->isLocalFrame())
1451 return true;
1452
1453 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten tChecking();
1454 }
1455
1442 } // namespace blink 1456 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698