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

Side by Side Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block
Patch Set: Ugh. Created 4 years, 6 months 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 | « third_party/WebKit/Source/web/WebFrame.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "web/WebRemoteFrameImpl.h" 5 #include "web/WebRemoteFrameImpl.h"
6 6
7 #include "core/dom/Fullscreen.h" 7 #include "core/dom/Fullscreen.h"
8 #include "core/dom/RemoteSecurityContext.h" 8 #include "core/dom/RemoteSecurityContext.h"
9 #include "core/dom/SecurityContext.h" 9 #include "core/dom/SecurityContext.h"
10 #include "core/frame/FrameView.h" 10 #include "core/frame/FrameView.h"
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 } 654 }
655 655
656 void WebRemoteFrameImpl::resetReplicatedContentSecurityPolicy() const 656 void WebRemoteFrameImpl::resetReplicatedContentSecurityPolicy() const
657 { 657 {
658 frame()->securityContext()->resetReplicatedContentSecurityPolicy(); 658 frame()->securityContext()->resetReplicatedContentSecurityPolicy();
659 } 659 }
660 660
661 void WebRemoteFrameImpl::setReplicatedShouldEnforceStrictMixedContentChecking(bo ol shouldEnforce) const 661 void WebRemoteFrameImpl::setReplicatedShouldEnforceStrictMixedContentChecking(bo ol shouldEnforce) const
662 { 662 {
663 DCHECK(frame()); 663 DCHECK(frame());
664 frame()->securityContext()->setShouldEnforceStrictMixedContentChecking(shoul dEnforce); 664 WebInsecureRequestPolicy oldPolicy = frame()->securityContext()->getInsecure RequestPolicy();
665 WebInsecureRequestPolicy newPolicy = shouldEnforce ? oldPolicy | kBlockAllMi xedContent : oldPolicy & ~kBlockAllMixedContent;
666 frame()->securityContext()->setInsecureRequestPolicy(newPolicy);
665 } 667 }
666 668
667 void WebRemoteFrameImpl::setReplicatedPotentiallyTrustworthyUniqueOrigin(bool is UniqueOriginPotentiallyTrustworthy) const 669 void WebRemoteFrameImpl::setReplicatedPotentiallyTrustworthyUniqueOrigin(bool is UniqueOriginPotentiallyTrustworthy) const
668 { 670 {
669 DCHECK(frame()); 671 DCHECK(frame());
670 // If |isUniqueOriginPotentiallyTrustworthy| is true, then the origin must b e unique. 672 // If |isUniqueOriginPotentiallyTrustworthy| is true, then the origin must b e unique.
671 DCHECK(!isUniqueOriginPotentiallyTrustworthy || frame()->securityContext()-> getSecurityOrigin()->isUnique()); 673 DCHECK(!isUniqueOriginPotentiallyTrustworthy || frame()->securityContext()-> getSecurityOrigin()->isUnique());
672 frame()->securityContext()->getSecurityOrigin()->setUniqueOriginIsPotentiall yTrustworthy(isUniqueOriginPotentiallyTrustworthy); 674 frame()->securityContext()->getSecurityOrigin()->setUniqueOriginIsPotentiall yTrustworthy(isUniqueOriginPotentiallyTrustworthy);
673 } 675 }
674 676
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 728
727 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, WebRemoteFrameCli ent* client) 729 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, WebRemoteFrameCli ent* client)
728 : WebRemoteFrame(scope) 730 : WebRemoteFrame(scope)
729 , m_frameClient(RemoteFrameClientImpl::create(this)) 731 , m_frameClient(RemoteFrameClientImpl::create(this))
730 , m_client(client) 732 , m_client(client)
731 , m_selfKeepAlive(this) 733 , m_selfKeepAlive(this)
732 { 734 {
733 } 735 }
734 736
735 } // namespace blink 737 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrame.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698