third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h - Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable.

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h

Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed review comments. Created 4 years, 3 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

« no previous file with comments | « third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.h ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Apple Inc. All rights reserved.	2 * Copyright (C) 2013 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 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 ScriptPromise load(ScriptState*, const String& sessionId);	81 ScriptPromise load(ScriptState*, const String& sessionId);

82	82

83 ScriptPromise update(ScriptState*, const DOMArrayPiece& response);	83 ScriptPromise update(ScriptState*, const DOMArrayPiece& response);

84 ScriptPromise close(ScriptState*);	84 ScriptPromise close(ScriptState*);

85 ScriptPromise remove(ScriptState*);	85 ScriptPromise remove(ScriptState*);

86	86

87 // EventTarget	87 // EventTarget

88 const AtomicString& interfaceName() const override;	88 const AtomicString& interfaceName() const override;

89 ExecutionContext* getExecutionContext() const override;	89 ExecutionContext* getExecutionContext() const override;

90	90

91 // ActiveScriptWrappable	91 // ScriptWrappable

92 bool hasPendingActivity() const final;	92 bool hasPendingActivity() const final;

93	93

94 // ActiveDOMObject	94 // ActiveDOMObject

95 void stop() override;	95 void stop() override;

96	96

97 DECLARE_VIRTUAL_TRACE();	97 DECLARE_VIRTUAL_TRACE();

98	98

99 private:	99 private:

100 class PendingAction;	100 class PendingAction;

101 friend class NewSessionResultPromise;	101 friend class NewSessionResultPromise;

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 typedef ScriptPromiseProperty<Member<MediaKeySession>, ToV8UndefinedGenerato r, Member<DOMException>> ClosedPromise;	138 typedef ScriptPromiseProperty<Member<MediaKeySession>, ToV8UndefinedGenerato r, Member<DOMException>> ClosedPromise;

139 Member<ClosedPromise> m_closedPromise;	139 Member<ClosedPromise> m_closedPromise;

140	140

141 HeapDeque<Member<PendingAction>> m_pendingActions;	141 HeapDeque<Member<PendingAction>> m_pendingActions;

142 Timer<MediaKeySession> m_actionTimer;	142 Timer<MediaKeySession> m_actionTimer;

143 };	143 };

144	144

145 } // namespace blink	145 } // namespace blink

146	146

147 #endif // MediaKeySession_h	147 #endif // MediaKeySession_h

OLD	NEW