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

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

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 #ifndef RemoteFrameOwner_h 5 #ifndef RemoteFrameOwner_h
6 #define RemoteFrameOwner_h 6 #define RemoteFrameOwner_h
7 7
8 #include "core/frame/FrameOwner.h" 8 #include "core/frame/FrameOwner.h"
9 #include "platform/scroll/ScrollTypes.h" 9 #include "platform/scroll/ScrollTypes.h"
10 #include "public/web/WebFrameOwnerProperties.h" 10 #include "public/web/WebFrameOwnerProperties.h"
(...skipping 29 matching lines...) Expand all
40 void renderFallbackContent() override {} 40 void renderFallbackContent() override {}
41 41
42 AtomicString browsingContextContainerName() const override { 42 AtomicString browsingContextContainerName() const override {
43 return m_browsingContextContainerName; 43 return m_browsingContextContainerName;
44 } 44 }
45 ScrollbarMode scrollingMode() const override { return m_scrolling; } 45 ScrollbarMode scrollingMode() const override { return m_scrolling; }
46 int marginWidth() const override { return m_marginWidth; } 46 int marginWidth() const override { return m_marginWidth; }
47 int marginHeight() const override { return m_marginHeight; } 47 int marginHeight() const override { return m_marginHeight; }
48 bool allowFullscreen() const override { return m_allowFullscreen; } 48 bool allowFullscreen() const override { return m_allowFullscreen; }
49 bool allowPaymentRequest() const override { return m_allowPaymentRequest; } 49 bool allowPaymentRequest() const override { return m_allowPaymentRequest; }
50 bool isDisplayNone() const override { return m_isDisplayNone; }
51 AtomicString csp() const override { return m_csp; } 50 AtomicString csp() const override { return m_csp; }
52 const WebVector<mojom::blink::PermissionName>& delegatedPermissions() 51 const WebVector<mojom::blink::PermissionName>& delegatedPermissions()
53 const override { 52 const override {
54 return m_delegatedPermissions; 53 return m_delegatedPermissions;
55 } 54 }
56 55
57 void setBrowsingContextContainerName(const WebString& name) { 56 void setBrowsingContextContainerName(const WebString& name) {
58 m_browsingContextContainerName = name; 57 m_browsingContextContainerName = name;
59 } 58 }
60 void setScrollingMode(WebFrameOwnerProperties::ScrollingMode); 59 void setScrollingMode(WebFrameOwnerProperties::ScrollingMode);
61 void setMarginWidth(int marginWidth) { m_marginWidth = marginWidth; } 60 void setMarginWidth(int marginWidth) { m_marginWidth = marginWidth; }
62 void setMarginHeight(int marginHeight) { m_marginHeight = marginHeight; } 61 void setMarginHeight(int marginHeight) { m_marginHeight = marginHeight; }
63 void setAllowFullscreen(bool allowFullscreen) { 62 void setAllowFullscreen(bool allowFullscreen) {
64 m_allowFullscreen = allowFullscreen; 63 m_allowFullscreen = allowFullscreen;
65 } 64 }
66 void setAllowPaymentRequest(bool allowPaymentRequest) { 65 void setAllowPaymentRequest(bool allowPaymentRequest) {
67 m_allowPaymentRequest = allowPaymentRequest; 66 m_allowPaymentRequest = allowPaymentRequest;
68 } 67 }
69 void setIsDisplayNone(bool isDisplayNone) { m_isDisplayNone = isDisplayNone; }
70 void setCsp(const WebString& csp) { m_csp = csp; } 68 void setCsp(const WebString& csp) { m_csp = csp; }
71 void setDelegatedpermissions( 69 void setDelegatedpermissions(
72 const WebVector<mojom::blink::PermissionName>& delegatedPermissions) { 70 const WebVector<mojom::blink::PermissionName>& delegatedPermissions) {
73 m_delegatedPermissions = delegatedPermissions; 71 m_delegatedPermissions = delegatedPermissions;
74 } 72 }
75 73
76 DECLARE_VIRTUAL_TRACE(); 74 DECLARE_VIRTUAL_TRACE();
77 75
78 private: 76 private:
79 RemoteFrameOwner(SandboxFlags, const WebFrameOwnerProperties&); 77 RemoteFrameOwner(SandboxFlags, const WebFrameOwnerProperties&);
80 78
81 // Intentionally private to prevent redundant checks when the type is 79 // Intentionally private to prevent redundant checks when the type is
82 // already HTMLFrameOwnerElement. 80 // already HTMLFrameOwnerElement.
83 bool isLocal() const override { return false; } 81 bool isLocal() const override { return false; }
84 bool isRemote() const override { return true; } 82 bool isRemote() const override { return true; }
85 83
86 Member<Frame> m_frame; 84 Member<Frame> m_frame;
87 SandboxFlags m_sandboxFlags; 85 SandboxFlags m_sandboxFlags;
88 AtomicString m_browsingContextContainerName; 86 AtomicString m_browsingContextContainerName;
89 ScrollbarMode m_scrolling; 87 ScrollbarMode m_scrolling;
90 int m_marginWidth; 88 int m_marginWidth;
91 int m_marginHeight; 89 int m_marginHeight;
92 bool m_allowFullscreen; 90 bool m_allowFullscreen;
93 bool m_allowPaymentRequest; 91 bool m_allowPaymentRequest;
94 bool m_isDisplayNone;
95 WebString m_csp; 92 WebString m_csp;
96 WebVector<mojom::blink::PermissionName> m_delegatedPermissions; 93 WebVector<mojom::blink::PermissionName> m_delegatedPermissions;
97 }; 94 };
98 95
99 DEFINE_TYPE_CASTS(RemoteFrameOwner, 96 DEFINE_TYPE_CASTS(RemoteFrameOwner,
100 FrameOwner, 97 FrameOwner,
101 owner, 98 owner,
102 owner->isRemote(), 99 owner->isRemote(),
103 owner.isRemote()); 100 owner.isRemote());
104 101
105 } // namespace blink 102 } // namespace blink
106 103
107 #endif // RemoteFrameOwner_h 104 #endif // RemoteFrameOwner_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp ('k') | third_party/WebKit/Source/web/RemoteFrameOwner.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698