| Index: third_party/WebKit/Source/platform/heap/Member.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/Member.h b/third_party/WebKit/Source/platform/heap/Member.h
|
| index b2bac898b0c9e4b65564bf2e4e3e53dca4d4bd83..a4d34431b702ffc6c172fbbf426c5ecba98b8930 100644
|
| --- a/third_party/WebKit/Source/platform/heap/Member.h
|
| +++ b/third_party/WebKit/Source/platform/heap/Member.h
|
| @@ -179,14 +179,6 @@ class MemberBase {
|
| #if DCHECK_IS_ON()
|
| const ThreadState* m_creationThreadState;
|
| #endif
|
| -
|
| - template <bool x,
|
| - WTF::WeakHandlingFlag y,
|
| - WTF::ShouldWeakPointersBeMarkedStrongly z,
|
| - typename U,
|
| - typename V>
|
| - friend struct CollectionBackingTraceTrait;
|
| - friend class Visitor;
|
| };
|
|
|
| // Members are used in classes to contain strong pointers to other oilpan heap
|
| @@ -240,15 +232,6 @@ class Member : public MemberBase<T, TracenessMemberConfiguration::Traced> {
|
| Parent::operator=(nullptr);
|
| return *this;
|
| }
|
| -
|
| - protected:
|
| - template <bool x,
|
| - WTF::WeakHandlingFlag y,
|
| - WTF::ShouldWeakPointersBeMarkedStrongly z,
|
| - typename U,
|
| - typename V>
|
| - friend struct CollectionBackingTraceTrait;
|
| - friend class Visitor;
|
| };
|
|
|
| // A checked version of Member<>, verifying that only same-thread references
|
| @@ -333,15 +316,6 @@ class SameThreadCheckedMember : public Member<T> {
|
| return *this;
|
| }
|
|
|
| - protected:
|
| - template <bool x,
|
| - WTF::WeakHandlingFlag y,
|
| - WTF::ShouldWeakPointersBeMarkedStrongly z,
|
| - typename U,
|
| - typename V>
|
| - friend struct CollectionBackingTraceTrait;
|
| - friend class Visitor;
|
| -
|
| private:
|
| void checkPointer() {
|
| if (!this->m_raw)
|
|
|