Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: third_party/WebKit/Source/bindings/tests/results/core/TestDictionary.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/tests/results/core/TestDictionary.h
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/TestDictionary.h b/third_party/WebKit/Source/bindings/tests/results/core/TestDictionary.h
index ae215cad44f44f68e74fa7a5b3c74bf5cbc7ba96..9ea864f1c94dc2ed947302bb3aeec96958246c41 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/TestDictionary.h
+++ b/third_party/WebKit/Source/bindings/tests/results/core/TestDictionary.h
@@ -14,7 +14,7 @@
#include "bindings/tests/idls/core/TestInterface2.h"
#include "bindings/tests/idls/core/TestInterfaceGarbageCollected.h"
#include "bindings/tests/idls/core/TestInterfaceImplementation.h"
-#include "bindings/tests/idls/core/TestInterfaceWillBeGarbageCollected.h"
+#include "bindings/tests/idls/core/TestInterfaceGarbageCollected.h"
#include "core/CoreExport.h"
#include "core/dom/DOMTypedArray.h"
#include "core/dom/Element.h"
@@ -62,9 +62,9 @@ public:
void setDoubleOrStringSequenceMember(const HeapVector<DoubleOrString>& value) { m_doubleOrStringSequenceMember = value; }
bool hasElementOrNullMember() const { return m_elementOrNullMember; }
- PassRefPtrWillBeRawPtr<Element> elementOrNullMember() const { return m_elementOrNullMember; }
- void setElementOrNullMember(PassRefPtrWillBeRawPtr<Element> value) { m_elementOrNullMember = value; }
- void setElementOrNullMemberToNull() { m_elementOrNullMember = RefPtrWillBeMember<Element>(); }
+ RawPtr<Element> elementOrNullMember() const { return m_elementOrNullMember; }
+ void setElementOrNullMember(RawPtr<Element> value) { m_elementOrNullMember = value; }
+ void setElementOrNullMemberToNull() { m_elementOrNullMember = Member<Element>(); }
bool hasEnumMember() const { return !m_enumMember.isNull(); }
String enumMember() const { return m_enumMember; }
@@ -75,8 +75,8 @@ public:
void setEnumSequenceMember(const Vector<String>& value) { m_enumSequenceMember = value; }
bool hasEventTargetMember() const { return m_eventTargetMember; }
- PassRefPtrWillBeRawPtr<EventTarget> eventTargetMember() const { return m_eventTargetMember; }
- void setEventTargetMember(PassRefPtrWillBeRawPtr<EventTarget> value) { m_eventTargetMember = value; }
+ RawPtr<EventTarget> eventTargetMember() const { return m_eventTargetMember; }
+ void setEventTargetMember(RawPtr<EventTarget> value) { m_eventTargetMember = value; }
bool hasInternalDictionarySequenceMember() const { return !m_internalDictionarySequenceMember.isNull(); }
const HeapVector<InternalDictionary>& internalDictionarySequenceMember() const { return m_internalDictionarySequenceMember.get(); }
@@ -154,18 +154,18 @@ public:
const Vector<RefPtr<TestInterfaceImplementation>>& testInterfaceSequenceMember() const { return m_testInterfaceSequenceMember.get(); }
void setTestInterfaceSequenceMember(const Vector<RefPtr<TestInterfaceImplementation>>& value) { m_testInterfaceSequenceMember = value; }
- bool hasTestInterfaceWillBeGarbageCollectedMember() const { return m_testInterfaceWillBeGarbageCollectedMember; }
- PassRefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> testInterfaceWillBeGarbageCollectedMember() const { return m_testInterfaceWillBeGarbageCollectedMember; }
- void setTestInterfaceWillBeGarbageCollectedMember(PassRefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> value) { m_testInterfaceWillBeGarbageCollectedMember = value; }
+ bool hasTestInterfaceGarbageCollectedMember() const { return m_testInterfaceGarbageCollectedMember; }
+ RawPtr<TestInterfaceGarbageCollected> testInterfaceGarbageCollectedMember() const { return m_testInterfaceGarbageCollectedMember; }
+ void setTestInterfaceGarbageCollectedMember(RawPtr<TestInterfaceGarbageCollected> value) { m_testInterfaceGarbageCollectedMember = value; }
- bool hasTestInterfaceWillBeGarbageCollectedOrNullMember() const { return m_testInterfaceWillBeGarbageCollectedOrNullMember; }
- PassRefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> testInterfaceWillBeGarbageCollectedOrNullMember() const { return m_testInterfaceWillBeGarbageCollectedOrNullMember; }
- void setTestInterfaceWillBeGarbageCollectedOrNullMember(PassRefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> value) { m_testInterfaceWillBeGarbageCollectedOrNullMember = value; }
- void setTestInterfaceWillBeGarbageCollectedOrNullMemberToNull() { m_testInterfaceWillBeGarbageCollectedOrNullMember = RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>(); }
+ bool hasTestInterfaceGarbageCollectedOrNullMember() const { return m_testInterfaceGarbageCollectedOrNullMember; }
+ RawPtr<TestInterfaceGarbageCollected> testInterfaceGarbageCollectedOrNullMember() const { return m_testInterfaceGarbageCollectedOrNullMember; }
+ void setTestInterfaceGarbageCollectedOrNullMember(RawPtr<TestInterfaceGarbageCollected> value) { m_testInterfaceGarbageCollectedOrNullMember = value; }
+ void setTestInterfaceGarbageCollectedOrNullMemberToNull() { m_testInterfaceGarbageCollectedOrNullMember = Member<TestInterfaceGarbageCollected>(); }
- bool hasTestInterfaceWillBeGarbageCollectedSequenceMember() const { return !m_testInterfaceWillBeGarbageCollectedSequenceMember.isNull(); }
- const WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>& testInterfaceWillBeGarbageCollectedSequenceMember() const { return m_testInterfaceWillBeGarbageCollectedSequenceMember.get(); }
- void setTestInterfaceWillBeGarbageCollectedSequenceMember(const WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>& value) { m_testInterfaceWillBeGarbageCollectedSequenceMember = value; }
+ bool hasTestInterfaceGarbageCollectedSequenceMember() const { return !m_testInterfaceGarbageCollectedSequenceMember.isNull(); }
+ const HeapVector<Member<TestInterfaceGarbageCollected>>& testInterfaceGarbageCollectedSequenceMember() const { return m_testInterfaceGarbageCollectedSequenceMember.get(); }
+ void setTestInterfaceGarbageCollectedSequenceMember(const HeapVector<Member<TestInterfaceGarbageCollected>>& value) { m_testInterfaceGarbageCollectedSequenceMember = value; }
bool hasUint8ArrayMember() const { return m_uint8ArrayMember; }
PassRefPtr<DOMUint8Array> uint8ArrayMember() const { return m_uint8ArrayMember; }
@@ -185,10 +185,10 @@ private:
Nullable<double> m_doubleOrNullMember;
DoubleOrString m_doubleOrStringMember;
Nullable<HeapVector<DoubleOrString>> m_doubleOrStringSequenceMember;
- RefPtrWillBeMember<Element> m_elementOrNullMember;
+ Member<Element> m_elementOrNullMember;
String m_enumMember;
Nullable<Vector<String>> m_enumSequenceMember;
- RefPtrWillBeMember<EventTarget> m_eventTargetMember;
+ Member<EventTarget> m_eventTargetMember;
Nullable<HeapVector<InternalDictionary>> m_internalDictionarySequenceMember;
Nullable<int> m_longMember;
ScriptValue m_objectMember;
@@ -207,9 +207,9 @@ private:
RefPtr<TestInterfaceImplementation> m_testInterfaceMember;
RefPtr<TestInterfaceImplementation> m_testInterfaceOrNullMember;
Nullable<Vector<RefPtr<TestInterfaceImplementation>>> m_testInterfaceSequenceMember;
- RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected> m_testInterfaceWillBeGarbageCollectedMember;
- RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected> m_testInterfaceWillBeGarbageCollectedOrNullMember;
- Nullable<WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>>> m_testInterfaceWillBeGarbageCollectedSequenceMember;
+ Member<TestInterfaceGarbageCollected> m_testInterfaceGarbageCollectedMember;
+ Member<TestInterfaceGarbageCollected> m_testInterfaceGarbageCollectedOrNullMember;
+ Nullable<HeapVector<Member<TestInterfaceGarbageCollected>>> m_testInterfaceGarbageCollectedSequenceMember;
RefPtr<DOMUint8Array> m_uint8ArrayMember;
Nullable<double> m_unrestrictedDoubleMember;

Powered by Google App Engine
This is Rietveld 408576698