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

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

Issue 2331223002: Added allowvr attribute to iframes and vrEnabled to Document (Closed)
Patch Set: Rebase and moved vrEnabled from navigator to document Created 4 years, 3 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 void WebFrame::setFrameOwnerProperties(const WebFrameOwnerProperties& properties ) 137 void WebFrame::setFrameOwnerProperties(const WebFrameOwnerProperties& properties )
138 { 138 {
139 // At the moment, this is only used to replicate frame owner properties 139 // At the moment, this is only used to replicate frame owner properties
140 // for frames with a remote owner. 140 // for frames with a remote owner.
141 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()) ; 141 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()) ;
142 DCHECK(owner); 142 DCHECK(owner);
143 owner->setScrollingMode(properties.scrollingMode); 143 owner->setScrollingMode(properties.scrollingMode);
144 owner->setMarginWidth(properties.marginWidth); 144 owner->setMarginWidth(properties.marginWidth);
145 owner->setMarginHeight(properties.marginHeight); 145 owner->setMarginHeight(properties.marginHeight);
146 owner->setAllowFullscreen(properties.allowFullscreen); 146 owner->setAllowFullscreen(properties.allowFullscreen);
147 owner->setAllowVR(properties.allowVR);
147 owner->setDelegatedpermissions(properties.delegatedPermissions); 148 owner->setDelegatedpermissions(properties.delegatedPermissions);
148 } 149 }
149 150
150 WebFrame* WebFrame::opener() const 151 WebFrame* WebFrame::opener() const
151 { 152 {
152 return m_opener; 153 return m_opener;
153 } 154 }
154 155
155 void WebFrame::setOpener(WebFrame* opener) 156 void WebFrame::setOpener(WebFrame* opener)
156 { 157 {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac eFrameImpl(visitor, frame); } \ 366 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac eFrameImpl(visitor, frame); } \
366 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \ 367 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \
367 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); } 368 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); }
368 369
369 DEFINE_VISITOR_METHOD(Visitor*) 370 DEFINE_VISITOR_METHOD(Visitor*)
370 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 371 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
371 372
372 #undef DEFINE_VISITOR_METHOD 373 #undef DEFINE_VISITOR_METHOD
373 374
374 } // namespace blink 375 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698