| Index: third_party/WebKit/Source/core/html/forms/FormController.h
|
| diff --git a/third_party/WebKit/Source/core/html/forms/FormController.h b/third_party/WebKit/Source/core/html/forms/FormController.h
|
| index d09781c59e88a26027402435fc956185c23c0372..e4ddf379e8ddd2d58c8eb23d73fe772740a84ee5 100644
|
| --- a/third_party/WebKit/Source/core/html/forms/FormController.h
|
| +++ b/third_party/WebKit/Source/core/html/forms/FormController.h
|
| @@ -75,10 +75,9 @@ inline void FormControlState::append(const String& value)
|
|
|
| using SavedFormStateMap = HashMap<AtomicString, OwnPtr<SavedFormState>>;
|
|
|
| -class DocumentState final : public RefCountedWillBeGarbageCollected<DocumentState> {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentState);
|
| +class DocumentState final : public GarbageCollected<DocumentState> {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<DocumentState> create();
|
| + static RawPtr<DocumentState> create();
|
| DECLARE_TRACE();
|
|
|
| void addControl(HTMLFormControlElementWithState*);
|
| @@ -86,16 +85,15 @@ public:
|
| Vector<String> toStateVector();
|
|
|
| private:
|
| - using FormElementListHashSet = WillBeHeapListHashSet<RefPtrWillBeMember<HTMLFormControlElementWithState>, 64>;
|
| + using FormElementListHashSet = HeapListHashSet<Member<HTMLFormControlElementWithState>, 64>;
|
| FormElementListHashSet m_formControls;
|
| };
|
|
|
| -class FormController final : public NoBaseWillBeGarbageCollectedFinalized<FormController> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(FormController);
|
| +class FormController final : public GarbageCollectedFinalized<FormController> {
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<FormController> create()
|
| + static RawPtr<FormController> create()
|
| {
|
| - return adoptPtrWillBeNoop(new FormController);
|
| + return (new FormController);
|
| }
|
| ~FormController();
|
| DECLARE_TRACE();
|
| @@ -120,9 +118,9 @@ private:
|
| static void formStatesFromStateVector(const Vector<String>&, SavedFormStateMap&);
|
|
|
| RadioButtonGroupScope m_radioButtonGroupScope;
|
| - RefPtrWillBeMember<DocumentState> m_documentState;
|
| + Member<DocumentState> m_documentState;
|
| SavedFormStateMap m_savedFormStateMap;
|
| - OwnPtrWillBeMember<FormKeyGenerator> m_formKeyGenerator;
|
| + Member<FormKeyGenerator> m_formKeyGenerator;
|
| };
|
|
|
| } // namespace blink
|
|
|