Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
OLDNEW
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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 ScriptPromise generateRequest(ScriptState*, const String& initDataType, cons t DOMArrayPiece& initData); 77 ScriptPromise generateRequest(ScriptState*, const String& initDataType, cons t DOMArrayPiece& initData);
78 ScriptPromise load(ScriptState*, const String& sessionId); 78 ScriptPromise load(ScriptState*, const String& sessionId);
79 79
80 ScriptPromise update(ScriptState*, const DOMArrayPiece& response); 80 ScriptPromise update(ScriptState*, const DOMArrayPiece& response);
81 ScriptPromise close(ScriptState*); 81 ScriptPromise close(ScriptState*);
82 ScriptPromise remove(ScriptState*); 82 ScriptPromise remove(ScriptState*);
83 83
84 // EventTarget 84 // EventTarget
85 const AtomicString& interfaceName() const override; 85 const AtomicString& interfaceName() const override;
86 ExecutionContext* executionContext() const override; 86 ExecutionContext* getExecutionContext() const override;
87 87
88 // ActiveDOMObject 88 // ActiveDOMObject
89 bool hasPendingActivity() const override; 89 bool hasPendingActivity() const override;
90 void stop() override; 90 void stop() override;
91 91
92 // Oilpan: eagerly release owned m_session, which in turn 92 // Oilpan: eagerly release owned m_session, which in turn
93 // drops the client reference back to this MediaKeySession object. 93 // drops the client reference back to this MediaKeySession object.
94 EAGERLY_FINALIZE(); 94 EAGERLY_FINALIZE();
95 DECLARE_VIRTUAL_TRACE(); 95 DECLARE_VIRTUAL_TRACE();
96 96
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 typedef ScriptPromiseProperty<Member<MediaKeySession>, ToV8UndefinedGenerato r, Member<DOMException>> ClosedPromise; 135 typedef ScriptPromiseProperty<Member<MediaKeySession>, ToV8UndefinedGenerato r, Member<DOMException>> ClosedPromise;
136 Member<ClosedPromise> m_closedPromise; 136 Member<ClosedPromise> m_closedPromise;
137 137
138 HeapDeque<Member<PendingAction>> m_pendingActions; 138 HeapDeque<Member<PendingAction>> m_pendingActions;
139 Timer<MediaKeySession> m_actionTimer; 139 Timer<MediaKeySession> m_actionTimer;
140 }; 140 };
141 141
142 } // namespace blink 142 } // namespace blink
143 143
144 #endif // MediaKeySession_h 144 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698