Chromium Code Reviews| Index: Source/core/css/resolver/ViewportStyleResolver.h |
| diff --git a/Source/core/css/resolver/ViewportStyleResolver.h b/Source/core/css/resolver/ViewportStyleResolver.h |
| index 30b663f2b18c11945f5dd2da2523a9e6c184e740..a6c4e010ad7e13e65c5659f67cb6b162cb8f7185 100644 |
| --- a/Source/core/css/resolver/ViewportStyleResolver.h |
| +++ b/Source/core/css/resolver/ViewportStyleResolver.h |
| @@ -42,15 +42,14 @@ class Document; |
| class MutableStylePropertySet; |
| class StyleRuleViewport; |
| -class ViewportStyleResolver : public RefCounted<ViewportStyleResolver> { |
| +class ViewportStyleResolver : public RefCountedWillBeGarbageCollected<ViewportStyleResolver> { |
| + DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ViewportStyleResolver); |
| public: |
| - static PassRefPtr<ViewportStyleResolver> create(Document* document) |
| + static PassRefPtrWillBeRawPtr<ViewportStyleResolver> create(Document* document) |
| { |
| - return adoptRef(new ViewportStyleResolver(document)); |
| + return adoptRefWillBeNoop(new ViewportStyleResolver(document)); |
| } |
| - ~ViewportStyleResolver(); |
| - |
| enum Origin { UserAgentOrigin, AuthorOrigin }; |
| void collectViewportRules(RuleSet*, Origin); |
| @@ -58,6 +57,8 @@ public: |
| void clearDocument(); |
| void resolve(); |
| + void trace(Visitor*); |
| + |
| private: |
| explicit ViewportStyleResolver(Document*); |
| @@ -67,7 +68,7 @@ private: |
| Length viewportLengthValue(CSSPropertyID) const; |
| Document* m_document; |
|
haraken
2014/03/19 10:26:23
This raw pointer is safe since it's cleared in cle
wibling-chromium
2014/03/19 10:33:19
Yes, that was my assessment as well.
|
| - RefPtr<MutableStylePropertySet> m_propertySet; |
| + RefPtrWillBeMember<MutableStylePropertySet> m_propertySet; |
| bool m_hasAuthorStyle; |
| }; |