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

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

Issue 2568123002: [DO NOT SUBMIT] Support allowpaymentrequest with out-of-process iframes (Closed)
Patch Set: Created 4 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
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/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/frame/FrameHost.h" 9 #include "core/frame/FrameHost.h"
10 #include "core/frame/FrameView.h" 10 #include "core/frame/FrameView.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 if (frame->isLocalFrame()) { 146 if (frame->isLocalFrame()) {
147 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( 147 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties(
148 properties.marginWidth, properties.marginHeight, 148 properties.marginWidth, properties.marginHeight,
149 static_cast<ScrollbarMode>(properties.scrollingMode)); 149 static_cast<ScrollbarMode>(properties.scrollingMode));
150 } 150 }
151 151
152 owner->setScrollingMode(properties.scrollingMode); 152 owner->setScrollingMode(properties.scrollingMode);
153 owner->setMarginWidth(properties.marginWidth); 153 owner->setMarginWidth(properties.marginWidth);
154 owner->setMarginHeight(properties.marginHeight); 154 owner->setMarginHeight(properties.marginHeight);
155 owner->setAllowFullscreen(properties.allowFullscreen); 155 owner->setAllowFullscreen(properties.allowFullscreen);
156 owner->setAllowPaymentRequest(properties.allowPaymentRequest);
156 owner->setCsp(properties.requiredCsp); 157 owner->setCsp(properties.requiredCsp);
157 owner->setDelegatedpermissions(properties.delegatedPermissions); 158 owner->setDelegatedpermissions(properties.delegatedPermissions);
158 } 159 }
159 160
160 WebFrame* WebFrame::opener() const { 161 WebFrame* WebFrame::opener() const {
161 return m_opener; 162 return m_opener;
162 } 163 }
163 164
164 void WebFrame::setOpener(WebFrame* opener) { 165 void WebFrame::setOpener(WebFrame* opener) {
165 if (m_opener) 166 if (m_opener)
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ 337 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \
337 clearWeakFramesImpl(visitor); \ 338 clearWeakFramesImpl(visitor); \
338 } 339 }
339 340
340 DEFINE_VISITOR_METHOD(Visitor*) 341 DEFINE_VISITOR_METHOD(Visitor*)
341 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 342 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
342 343
343 #undef DEFINE_VISITOR_METHOD 344 #undef DEFINE_VISITOR_METHOD
344 345
345 } // namespace blink 346 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/RemoteFrameOwner.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698