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

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

Issue 2394473002: iframes with allowpaymentrequest attribute are allowed to make payment requests. (Closed)
Patch Set: Rebaselined tests Created 4 years, 2 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 "public/web/WebFrame.h" 5 #include "public/web/WebFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxyManager.h" 7 #include "bindings/core/v8/WindowProxyManager.h"
8 #include "core/frame/FrameHost.h" 8 #include "core/frame/FrameHost.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 void WebFrame::setFrameOwnerProperties( 133 void WebFrame::setFrameOwnerProperties(
134 const WebFrameOwnerProperties& properties) { 134 const WebFrameOwnerProperties& properties) {
135 // At the moment, this is only used to replicate frame owner properties 135 // At the moment, this is only used to replicate frame owner properties
136 // for frames with a remote owner. 136 // for frames with a remote owner.
137 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); 137 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner());
138 DCHECK(owner); 138 DCHECK(owner);
139 owner->setScrollingMode(properties.scrollingMode); 139 owner->setScrollingMode(properties.scrollingMode);
140 owner->setMarginWidth(properties.marginWidth); 140 owner->setMarginWidth(properties.marginWidth);
141 owner->setMarginHeight(properties.marginHeight); 141 owner->setMarginHeight(properties.marginHeight);
142 owner->setAllowFullscreen(properties.allowFullscreen); 142 owner->setAllowFullscreen(properties.allowFullscreen);
143 owner->setAllowPaymentRequest(properties.allowPaymentRequest);
143 owner->setCsp(properties.requiredCsp); 144 owner->setCsp(properties.requiredCsp);
144 owner->setDelegatedpermissions(properties.delegatedPermissions); 145 owner->setDelegatedpermissions(properties.delegatedPermissions);
145 } 146 }
146 147
147 WebFrame* WebFrame::opener() const { 148 WebFrame* WebFrame::opener() const {
148 return m_opener; 149 return m_opener;
149 } 150 }
150 151
151 void WebFrame::setOpener(WebFrame* opener) { 152 void WebFrame::setOpener(WebFrame* opener) {
152 if (m_opener) 153 if (m_opener)
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ 347 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \
347 clearWeakFramesImpl(visitor); \ 348 clearWeakFramesImpl(visitor); \
348 } 349 }
349 350
350 DEFINE_VISITOR_METHOD(Visitor*) 351 DEFINE_VISITOR_METHOD(Visitor*)
351 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 352 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
352 353
353 #undef DEFINE_VISITOR_METHOD 354 #undef DEFINE_VISITOR_METHOD
354 355
355 } // namespace blink 356 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698