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

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

Issue 1723753002: Make Document::isSecureContext() work for OOPIFs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: alexmos comments Created 4 years, 9 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
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/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/frame/Settings.h" 8 #include "core/frame/Settings.h"
9 #include "core/html/HTMLFrameOwnerElement.h" 9 #include "core/html/HTMLFrameOwnerElement.h"
10 #include "core/layout/LayoutObject.h" 10 #include "core/layout/LayoutObject.h"
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 ASSERT(frame()); 688 ASSERT(frame());
689 frame()->tree().setPrecalculatedName(name, uniqueName); 689 frame()->tree().setPrecalculatedName(name, uniqueName);
690 } 690 }
691 691
692 void WebRemoteFrameImpl::setReplicatedShouldEnforceStrictMixedContentChecking(bo ol shouldEnforce) const 692 void WebRemoteFrameImpl::setReplicatedShouldEnforceStrictMixedContentChecking(bo ol shouldEnforce) const
693 { 693 {
694 ASSERT(frame()); 694 ASSERT(frame());
695 frame()->securityContext()->setShouldEnforceStrictMixedContentChecking(shoul dEnforce); 695 frame()->securityContext()->setShouldEnforceStrictMixedContentChecking(shoul dEnforce);
696 } 696 }
697 697
698 void WebRemoteFrameImpl::setReplicatedPotentiallyTrustworthyUniqueOrigin(bool is UniqueOriginPotentiallyTrustworthy) const
699 {
700 ASSERT(frame());
701 // If |isUniqueOriginPotentiallyTrustworthy| is true, then the origin must b e unique.
702 ASSERT(!isUniqueOriginPotentiallyTrustworthy || frame()->securityContext()-> securityOrigin()->isUnique());
703 frame()->securityContext()->securityOrigin()->setUniqueOriginIsPotentiallyTr ustworthy(isUniqueOriginPotentiallyTrustworthy);
704 }
705
698 void WebRemoteFrameImpl::DispatchLoadEventForFrameOwner() const 706 void WebRemoteFrameImpl::DispatchLoadEventForFrameOwner() const
699 { 707 {
700 ASSERT(frame()->owner()->isLocal()); 708 ASSERT(frame()->owner()->isLocal());
701 frame()->owner()->dispatchLoad(); 709 frame()->owner()->dispatchLoad();
702 } 710 }
703 711
704 void WebRemoteFrameImpl::didStartLoading() 712 void WebRemoteFrameImpl::didStartLoading()
705 { 713 {
706 frame()->setIsLoading(true); 714 frame()->setIsLoading(true);
707 } 715 }
(...skipping 20 matching lines...) Expand all
728 : WebRemoteFrame(scope) 736 : WebRemoteFrame(scope)
729 , m_frameClient(RemoteFrameClientImpl::create(this)) 737 , m_frameClient(RemoteFrameClientImpl::create(this))
730 , m_client(client) 738 , m_client(client)
731 #if ENABLE(OILPAN) 739 #if ENABLE(OILPAN)
732 , m_selfKeepAlive(this) 740 , m_selfKeepAlive(this)
733 #endif 741 #endif
734 { 742 {
735 } 743 }
736 744
737 } // namespace blink 745 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698