Index: Source/core/html/MediaController.h |
diff --git a/Source/core/html/MediaController.h b/Source/core/html/MediaController.h |
index a4162dd37a6af15e860fa2c33d6a59a00add904d..c9311a906d75dd5dc65d828b71065d8b1bdab07c 100644 |
--- a/Source/core/html/MediaController.h |
+++ b/Source/core/html/MediaController.h |
@@ -84,7 +84,9 @@ public: |
bool isRestrained() const; |
bool isBlocked() const; |
- void clearExecutionContext() { m_executionContext = 0; } |
+#if !ENABLE(OILPAN) |
+ void clearExecutionContext() { m_executionContext = nullptr; } |
+#endif |
virtual void trace(Visitor*) OVERRIDE; |
@@ -124,7 +126,7 @@ private: |
OwnPtrWillBeMember<GenericEventQueue> m_pendingEventsQueue; |
mutable Timer<MediaController> m_clearPositionTimer; |
OwnPtr<Clock> m_clock; |
- ExecutionContext* m_executionContext; |
+ RawPtrWillBeWeakMember<ExecutionContext> m_executionContext; |
haraken
2014/06/13 13:23:14
Who uses this m_executionContext? Probably can we
zerny-chromium
2014/06/16 10:27:21
It is part of the EventTarget interface so I don't
|
Timer<MediaController> m_timeupdateTimer; |
double m_previousTimeupdateTime; |
}; |