Index: Source/core/html/shadow/PickerIndicatorElement.h |
diff --git a/Source/core/html/shadow/PickerIndicatorElement.h b/Source/core/html/shadow/PickerIndicatorElement.h |
index 8b7a5e3d7401f89cbda23dc77a3440b39413a781..a92ef86a94dd22be335079db64b5c50b8770edf6 100644 |
--- a/Source/core/html/shadow/PickerIndicatorElement.h |
+++ b/Source/core/html/shadow/PickerIndicatorElement.h |
@@ -42,10 +42,11 @@ class HTMLInputElement; |
class PagePopup; |
class PickerIndicatorElement FINAL : public HTMLDivElement, public DateTimeChooserClient { |
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PickerIndicatorElement); |
public: |
// PickerIndicatorOwner implementer must call removePickerIndicatorOwner when |
// it doesn't handle event, e.g. at destruction. |
- class PickerIndicatorOwner { |
+ class PickerIndicatorOwner : public WillBeGarbageCollectedMixin { |
public: |
virtual ~PickerIndicatorOwner() { } |
virtual bool isPickerIndicatorOwnerDisabledOrReadOnly() const = 0; |
@@ -55,12 +56,14 @@ public: |
virtual bool setupDateTimeChooserParameters(DateTimeChooserParameters&) = 0; |
}; |
- static PassRefPtr<PickerIndicatorElement> create(Document&, PickerIndicatorOwner&); |
+ static PassRefPtrWillBeRawPtr<PickerIndicatorElement> create(Document&, PickerIndicatorOwner&); |
virtual ~PickerIndicatorElement(); |
+ virtual void trace(Visitor*) OVERRIDE; |
+ |
void openPopup(); |
void closePopup(); |
virtual bool willRespondToMouseClickEvents() OVERRIDE; |
- void removePickerIndicatorOwner() { m_pickerIndicatorOwner = 0; } |
+ void removePickerIndicatorOwner() { m_pickerIndicatorOwner = nullptr; } |
// DateTimeChooserClient implementation. |
virtual void didChooseValue(const String&) OVERRIDE; |
@@ -76,7 +79,7 @@ private: |
HTMLInputElement* hostInput(); |
- PickerIndicatorOwner* m_pickerIndicatorOwner; |
+ RawPtrWillBeWeakMember<PickerIndicatorOwner> m_pickerIndicatorOwner; |
haraken
2014/05/07 15:00:04
As Mads is commenting in https://codereview.chromi
tkent
2014/05/08 01:20:07
That's right.
keishi
2014/05/08 01:47:44
Done.
|
RefPtr<DateTimeChooser> m_chooser; |
}; |