Source/core/timing/Performance.h - Issue 693483004: Enable Oilpan for core/timing/.

Unified Diff: Source/core/timing/Performance.h

Issue 693483004: Enable Oilpan for core/timing/. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: rebased and refreshed Created 5 years, 8 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

« Source/core/timing/DOMWindowPerformance.h ('K') | « Source/core/timing/MemoryInfo.idl ('k') | Source/core/timing/Performance.cpp » ('j') | Source/core/timing/PerformanceResourceTiming.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/timing/Performance.h

diff --git a/Source/core/timing/Performance.h b/Source/core/timing/Performance.h

index 422d238889a42162c4d803480fcc503127f899bd..fc073f6927574ec3ce0c0faacdfd963de260c815 100644

--- a/Source/core/timing/Performance.h

+++ b/Source/core/timing/Performance.h

@@ -40,7 +40,6 @@

#include "core/timing/PerformanceNavigation.h"

#include "core/timing/PerformanceTiming.h"

#include "platform/heap/Handle.h"

-#include "wtf/PassRefPtr.h"

#include "wtf/RefCounted.h"

#include "wtf/RefPtr.h"

#include "wtf/text/WTFString.h"

@@ -52,23 +51,23 @@ class ExceptionState;

class ResourceTimingInfo;

class UserTiming;

-using PerformanceEntryVector = WillBeHeapVector<RefPtrWillBeMember<PerformanceEntry>>;

+using PerformanceEntryVector = HeapVector<Member<PerformanceEntry>>;

-class CORE_EXPORT Performance final : public EventTargetWithInlineData, public RefCountedWillBeNoBase<Performance>, public DOMWindowProperty {

+class CORE_EXPORT Performance final : public RefCountedGarbageCollectedEventTargetWithInlineData<Performance>, public DOMWindowProperty {

DEFINE_WRAPPERTYPEINFO();

- REFCOUNTED_EVENT_TARGET(Performance);

+ DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<Performance>);

haraken 2015/04/22 11:17:25 Not related to this CL, this macro sounds a bit co

WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Performance);

public:

- static PassRefPtrWillBeRawPtr<Performance> create(LocalFrame* frame)

+ static Performance* create(LocalFrame* frame)

{

- return adoptRefWillBeNoop(new Performance(frame));

+ return new Performance(frame);

}

virtual ~Performance();

virtual const AtomicString& interfaceName() const override;

virtual ExecutionContext* executionContext() const override;

- PassRefPtrWillBeRawPtr<MemoryInfo> memory() const;

+ MemoryInfo* memory();

PerformanceNavigation* navigation() const;

PerformanceTiming* timing() const;

double now() const;

@@ -96,7 +95,7 @@ private:

explicit Performance(LocalFrame*);

bool isResourceTimingBufferFull();

- void addResourceTimingBuffer(PassRefPtrWillBeRawPtr<PerformanceEntry>);

+ void addResourceTimingBuffer(PerformanceEntry*);

mutable RefPtrWillBeMember<PerformanceNavigation> m_navigation;

mutable RefPtrWillBeMember<PerformanceTiming> m_timing;

@@ -105,7 +104,8 @@ private:

unsigned m_resourceTimingBufferSize;

double m_referenceTime;

- RefPtrWillBeMember<UserTiming> m_userTiming;

+ WeakMember<MemoryInfo> m_memoryInfo;

haraken 2015/04/22 11:17:25 Why does this need to be weak? (c.f., You use Memb

sof 2015/04/22 11:41:36 Yes, it should be consistent with that (and Consol

haraken 2015/04/22 11:58:13 Either is fine with me :)

sof 2015/04/22 14:36:14 Created https://code.google.com/p/chromium/issues/

+ Member<UserTiming> m_userTiming;

};

} // namespace blink