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

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

Issue 2696283003: Revert of Don't create layout objects for children of display-none iframes. (Closed)
Patch Set: Created 3 years, 10 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( 13 RemoteFrameOwner::RemoteFrameOwner(
14 SandboxFlags flags, 14 SandboxFlags flags,
15 const WebFrameOwnerProperties& frameOwnerProperties) 15 const WebFrameOwnerProperties& frameOwnerProperties)
16 : m_sandboxFlags(flags), 16 : m_sandboxFlags(flags),
17 m_browsingContextContainerName( 17 m_browsingContextContainerName(
18 static_cast<String>(frameOwnerProperties.name)), 18 static_cast<String>(frameOwnerProperties.name)),
19 m_scrolling( 19 m_scrolling(
20 static_cast<ScrollbarMode>(frameOwnerProperties.scrollingMode)), 20 static_cast<ScrollbarMode>(frameOwnerProperties.scrollingMode)),
21 m_marginWidth(frameOwnerProperties.marginWidth), 21 m_marginWidth(frameOwnerProperties.marginWidth),
22 m_marginHeight(frameOwnerProperties.marginHeight), 22 m_marginHeight(frameOwnerProperties.marginHeight),
23 m_allowFullscreen(frameOwnerProperties.allowFullscreen), 23 m_allowFullscreen(frameOwnerProperties.allowFullscreen),
24 m_allowPaymentRequest(frameOwnerProperties.allowPaymentRequest), 24 m_allowPaymentRequest(frameOwnerProperties.allowPaymentRequest),
25 m_isDisplayNone(frameOwnerProperties.isDisplayNone),
26 m_csp(frameOwnerProperties.requiredCsp) {} 25 m_csp(frameOwnerProperties.requiredCsp) {}
27 26
28 DEFINE_TRACE(RemoteFrameOwner) { 27 DEFINE_TRACE(RemoteFrameOwner) {
29 visitor->trace(m_frame); 28 visitor->trace(m_frame);
30 FrameOwner::trace(visitor); 29 FrameOwner::trace(visitor);
31 } 30 }
32 31
33 void RemoteFrameOwner::setScrollingMode( 32 void RemoteFrameOwner::setScrollingMode(
34 WebFrameOwnerProperties::ScrollingMode mode) { 33 WebFrameOwnerProperties::ScrollingMode mode) {
35 m_scrolling = static_cast<ScrollbarMode>(mode); 34 m_scrolling = static_cast<ScrollbarMode>(mode);
36 } 35 }
37 36
38 void RemoteFrameOwner::setContentFrame(Frame& frame) { 37 void RemoteFrameOwner::setContentFrame(Frame& frame) {
39 m_frame = &frame; 38 m_frame = &frame;
40 } 39 }
41 40
42 void RemoteFrameOwner::clearContentFrame() { 41 void RemoteFrameOwner::clearContentFrame() {
43 DCHECK_EQ(m_frame->owner(), this); 42 DCHECK_EQ(m_frame->owner(), this);
44 m_frame = nullptr; 43 m_frame = nullptr;
45 } 44 }
46 45
47 void RemoteFrameOwner::dispatchLoad() { 46 void RemoteFrameOwner::dispatchLoad() {
48 WebLocalFrameImpl* webFrame = 47 WebLocalFrameImpl* webFrame =
49 WebLocalFrameImpl::fromFrame(toLocalFrame(*m_frame)); 48 WebLocalFrameImpl::fromFrame(toLocalFrame(*m_frame));
50 webFrame->client()->dispatchLoad(); 49 webFrame->client()->dispatchLoad();
51 } 50 }
52 51
53 } // namespace blink 52 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/RemoteFrameOwner.h ('k') | third_party/WebKit/Source/web/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698