| 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 c15a4edb2782dfc3f696b6e0fa95ea7bb0375806..c30152a94f94d3e3712d68cb00f15e90820ca527 100644
|
| --- a/third_party/WebKit/Source/core/dom/SecurityContext.h
|
| +++ b/third_party/WebKit/Source/core/dom/SecurityContext.h
|
| @@ -43,7 +43,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();
|
| @@ -87,7 +87,7 @@ protected:
|
| SecurityContext();
|
| virtual ~SecurityContext();
|
|
|
| - void setContentSecurityPolicy(PassRefPtrWillBeRawPtr<ContentSecurityPolicy>);
|
| + void setContentSecurityPolicy(RawPtr<ContentSecurityPolicy>);
|
|
|
| void didFailToInitializeSecurityOrigin() { m_haveInitializedSecurityOrigin = false; }
|
| bool haveInitializedSecurityOrigin() const { return m_haveInitializedSecurityOrigin; }
|
| @@ -95,7 +95,7 @@ protected:
|
| private:
|
| bool m_haveInitializedSecurityOrigin;
|
| RefPtr<SecurityOrigin> m_securityOrigin;
|
| - RefPtrWillBeMember<ContentSecurityPolicy> m_contentSecurityPolicy;
|
| + Member<ContentSecurityPolicy> m_contentSecurityPolicy;
|
|
|
| SandboxFlags m_sandboxFlags;
|
|
|
|
|