Source/core/html/MediaController.h - Issue 333813004: Oilpan: Make MediaControllers ExecutionContext a weak pointer.

Side by Side Diff: Source/core/html/MediaController.h

Issue 333813004: Oilpan: Make MediaControllers ExecutionContext a weak pointer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: nullptr Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Apple Inc. All rights reserved.	2 * Copyright (C) 2011 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77	77

78 typedef HTMLMediaElement::ReadyState ReadyState;	78 typedef HTMLMediaElement::ReadyState ReadyState;

79 ReadyState readyState() const { return m_readyState; }	79 ReadyState readyState() const { return m_readyState; }

80	80

81 enum PlaybackState { WAITING, PLAYING, ENDED };	81 enum PlaybackState { WAITING, PLAYING, ENDED };

82 const AtomicString& playbackState() const;	82 const AtomicString& playbackState() const;

83	83

84 bool isRestrained() const;	84 bool isRestrained() const;

85 bool isBlocked() const;	85 bool isBlocked() const;

86	86

87 void clearExecutionContext() { m_executionContext = 0; }	87 #if !ENABLE(OILPAN)

	88 void clearExecutionContext() { m_executionContext = nullptr; }

	89 #endif

88	90

89 virtual void trace(Visitor*) OVERRIDE;	91 virtual void trace(Visitor*) OVERRIDE;

90	92

91 private:	93 private:

92 MediaController(ExecutionContext*);	94 MediaController(ExecutionContext*);

93 void reportControllerState();	95 void reportControllerState();

94 void updateReadyState();	96 void updateReadyState();

95 void updatePlaybackState();	97 void updatePlaybackState();

96 void updateMediaElements();	98 void updateMediaElements();

97 void bringElementUpToSpeed(HTMLMediaElement*);	99 void bringElementUpToSpeed(HTMLMediaElement*);

(...skipping 19 matching lines...) Expand all Loading...
117 bool m_paused;	119 bool m_paused;

118 double m_defaultPlaybackRate;	120 double m_defaultPlaybackRate;

119 double m_volume;	121 double m_volume;

120 mutable double m_position;	122 mutable double m_position;

121 bool m_muted;	123 bool m_muted;

122 ReadyState m_readyState;	124 ReadyState m_readyState;

123 PlaybackState m_playbackState;	125 PlaybackState m_playbackState;

124 OwnPtrWillBeMember<GenericEventQueue> m_pendingEventsQueue;	126 OwnPtrWillBeMember<GenericEventQueue> m_pendingEventsQueue;

125 mutable Timer<MediaController> m_clearPositionTimer;	127 mutable Timer<MediaController> m_clearPositionTimer;

126 OwnPtr<Clock> m_clock;	128 OwnPtr<Clock> m_clock;

127 ExecutionContext* m_executionContext;	129 RawPtrWillBeWeakMember<ExecutionContext> m_executionContext;
	haraken 2014/06/13 13:23:14 Who uses this m_executionContext? Probably can we Who uses this m_executionContext? Probably can we just remove it completely? zerny-chromium 2014/06/16 10:27:21 It is part of the EventTarget interface so I don't Show quoted text On 2014/06/13 13:23:14, haraken wrote: > > Who uses this m_executionContext? Probably can we just remove it completely? It is part of the EventTarget interface so I don't think we can just remove it.
128 Timer<MediaController> m_timeupdateTimer;	130 Timer<MediaController> m_timeupdateTimer;

129 double m_previousTimeupdateTime;	131 double m_previousTimeupdateTime;

130 };	132 };

131	133

132 } // namespace WebCore	134 } // namespace WebCore

133	135

134 #endif	136 #endif

OLD	NEW

« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/MediaController.cpp » ('j') | no next file with comments »