| Index: third_party/WebKit/Source/core/dom/SecurityContext.h
|
| diff --git a/third_party/WebKit/Source/core/dom/SecurityContext.h b/third_party/WebKit/Source/core/dom/SecurityContext.h
|
| index f1f9483e656083c1b7bbd6ea176fdb6ade5a58d9..4c45f0b2263aebebbaea054d2dc3e5c60c6317cd 100644
|
| --- a/third_party/WebKit/Source/core/dom/SecurityContext.h
|
| +++ b/third_party/WebKit/Source/core/dom/SecurityContext.h
|
| @@ -46,7 +46,7 @@ class SecurityOrigin;
|
| class ContentSecurityPolicy;
|
| class KURL;
|
|
|
| -class CORE_EXPORT SecurityContext : public WillBeGarbageCollectedMixin {
|
| +class CORE_EXPORT SecurityContext : public GarbageCollectedMixin {
|
| WTF_MAKE_NONCOPYABLE(SecurityContext);
|
| public:
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -91,13 +91,13 @@ protected:
|
| SecurityContext();
|
| virtual ~SecurityContext();
|
|
|
| - void setContentSecurityPolicy(PassRefPtrWillBeRawPtr<ContentSecurityPolicy>);
|
| + void setContentSecurityPolicy(RawPtr<ContentSecurityPolicy>);
|
|
|
| void applySandboxFlags(SandboxFlags mask);
|
|
|
| private:
|
| RefPtr<SecurityOrigin> m_securityOrigin;
|
| - RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
|
| + Member<ContentSecurityPolicy> m_contentSecurityPolicy;
|
|
|
| SandboxFlags m_sandboxFlags;
|
|
|
|
|