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

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

Issue 2378643002: Propagating csp attribute changes on frameOwnerPropertiesChanged() (Closed)
Patch Set: rebasing on master Created 4 years, 2 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 22 matching lines...) Expand all
33 void clearContentFrame() override; 33 void clearContentFrame() override;
34 SandboxFlags getSandboxFlags() const override { return m_sandboxFlags; } 34 SandboxFlags getSandboxFlags() const override { return m_sandboxFlags; }
35 void setSandboxFlags(SandboxFlags flags) { m_sandboxFlags = flags; } 35 void setSandboxFlags(SandboxFlags flags) { m_sandboxFlags = flags; }
36 void dispatchLoad() override; 36 void dispatchLoad() override;
37 // TODO(dcheng): Implement. 37 // TODO(dcheng): Implement.
38 void renderFallbackContent() override {} 38 void renderFallbackContent() override {}
39 ScrollbarMode scrollingMode() const override { return m_scrolling; } 39 ScrollbarMode scrollingMode() const override { return m_scrolling; }
40 int marginWidth() const override { return m_marginWidth; } 40 int marginWidth() const override { return m_marginWidth; }
41 int marginHeight() const override { return m_marginHeight; } 41 int marginHeight() const override { return m_marginHeight; }
42 bool allowFullscreen() const override { return m_allowFullscreen; } 42 bool allowFullscreen() const override { return m_allowFullscreen; }
43 AtomicString csp() const override { return m_csp; }
43 const WebVector<WebPermissionType>& delegatedPermissions() const override { 44 const WebVector<WebPermissionType>& delegatedPermissions() const override {
44 return m_delegatedPermissions; 45 return m_delegatedPermissions;
45 } 46 }
46 47
47 void setScrollingMode(WebFrameOwnerProperties::ScrollingMode); 48 void setScrollingMode(WebFrameOwnerProperties::ScrollingMode);
48 void setMarginWidth(int marginWidth) { m_marginWidth = marginWidth; } 49 void setMarginWidth(int marginWidth) { m_marginWidth = marginWidth; }
49 void setMarginHeight(int marginHeight) { m_marginHeight = marginHeight; } 50 void setMarginHeight(int marginHeight) { m_marginHeight = marginHeight; }
50 void setAllowFullscreen(bool allowFullscreen) { 51 void setAllowFullscreen(bool allowFullscreen) {
51 m_allowFullscreen = allowFullscreen; 52 m_allowFullscreen = allowFullscreen;
52 } 53 }
54 void setCsp(const WebString& csp) { m_csp = csp; }
53 void setDelegatedpermissions( 55 void setDelegatedpermissions(
54 const WebVector<WebPermissionType>& delegatedPermissions) { 56 const WebVector<WebPermissionType>& delegatedPermissions) {
55 m_delegatedPermissions = delegatedPermissions; 57 m_delegatedPermissions = delegatedPermissions;
56 } 58 }
57 59
58 DECLARE_VIRTUAL_TRACE(); 60 DECLARE_VIRTUAL_TRACE();
59 61
60 private: 62 private:
61 RemoteFrameOwner(SandboxFlags, const WebFrameOwnerProperties&); 63 RemoteFrameOwner(SandboxFlags, const WebFrameOwnerProperties&);
62 64
63 // Intentionally private to prevent redundant checks when the type is 65 // Intentionally private to prevent redundant checks when the type is
64 // already HTMLFrameOwnerElement. 66 // already HTMLFrameOwnerElement.
65 bool isLocal() const override { return false; } 67 bool isLocal() const override { return false; }
66 bool isRemote() const override { return true; } 68 bool isRemote() const override { return true; }
67 69
68 Member<Frame> m_frame; 70 Member<Frame> m_frame;
69 SandboxFlags m_sandboxFlags; 71 SandboxFlags m_sandboxFlags;
70 ScrollbarMode m_scrolling; 72 ScrollbarMode m_scrolling;
71 int m_marginWidth; 73 int m_marginWidth;
72 int m_marginHeight; 74 int m_marginHeight;
73 bool m_allowFullscreen; 75 bool m_allowFullscreen;
76 WebString m_csp;
74 WebVector<WebPermissionType> m_delegatedPermissions; 77 WebVector<WebPermissionType> m_delegatedPermissions;
75 }; 78 };
76 79
77 DEFINE_TYPE_CASTS(RemoteFrameOwner, 80 DEFINE_TYPE_CASTS(RemoteFrameOwner,
78 FrameOwner, 81 FrameOwner,
79 owner, 82 owner,
80 owner->isRemote(), 83 owner->isRemote(),
81 owner.isRemote()); 84 owner.isRemote());
82 85
83 } // namespace blink 86 } // namespace blink
84 87
85 #endif // RemoteFrameOwner_h 88 #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