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

Side by Side Diff: third_party/WebKit/Source/web/RemoteFrameOwner.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be found 2 // Use of this source code is governed by a BSD-style license that can be found
3 // in the LICENSE file. 3 // in the LICENSE file.
4 4
5 #include "web/RemoteFrameOwner.h" 5 #include "web/RemoteFrameOwner.h"
6 6
7 #include "core/frame/LocalFrame.h" 7 #include "core/frame/LocalFrame.h"
8 #include "public/web/WebFrameClient.h" 8 #include "public/web/WebFrameClient.h"
9 #include "web/WebLocalFrameImpl.h" 9 #include "web/WebLocalFrameImpl.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 RemoteFrameOwner::RemoteFrameOwner(SandboxFlags flags, const WebFrameOwnerProper ties& frameOwnerProperties) 13 RemoteFrameOwner::RemoteFrameOwner(SandboxFlags flags, const WebFrameOwnerProper ties& frameOwnerProperties)
14 : m_sandboxFlags(flags) 14 : m_sandboxFlags(flags)
15 , m_scrolling(static_cast<ScrollbarMode>(frameOwnerProperties.scrollingMode) ) 15 , m_scrolling(static_cast<ScrollbarMode>(frameOwnerProperties.scrollingMode) )
16 , m_marginWidth(frameOwnerProperties.marginWidth) 16 , m_marginWidth(frameOwnerProperties.marginWidth)
17 , m_marginHeight(frameOwnerProperties.marginHeight) 17 , m_marginHeight(frameOwnerProperties.marginHeight)
18 , m_allowFullscreen(frameOwnerProperties.allowFullscreen) 18 , m_allowFullscreen(frameOwnerProperties.allowFullscreen)
19 , m_allowVR(frameOwnerProperties.allowVR)
19 { 20 {
20 } 21 }
21 22
22 DEFINE_TRACE(RemoteFrameOwner) 23 DEFINE_TRACE(RemoteFrameOwner)
23 { 24 {
24 visitor->trace(m_frame); 25 visitor->trace(m_frame);
25 FrameOwner::trace(visitor); 26 FrameOwner::trace(visitor);
26 } 27 }
27 28
28 void RemoteFrameOwner::setScrollingMode(WebFrameOwnerProperties::ScrollingMode m ode) 29 void RemoteFrameOwner::setScrollingMode(WebFrameOwnerProperties::ScrollingMode m ode)
(...skipping 12 matching lines...) Expand all
41 m_frame = nullptr; 42 m_frame = nullptr;
42 } 43 }
43 44
44 void RemoteFrameOwner::dispatchLoad() 45 void RemoteFrameOwner::dispatchLoad()
45 { 46 {
46 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(toLocalFrame(*m_f rame)); 47 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(toLocalFrame(*m_f rame));
47 webFrame->client()->dispatchLoad(); 48 webFrame->client()->dispatchLoad();
48 } 49 }
49 50
50 } // namespace blink 51 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698