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

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

Issue 18778002: Inherit EventTarget interface instead of duplicating its code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class MediaKeyError; 44 class MediaKeyError;
45 class MediaKeys; 45 class MediaKeys;
46 class ContentDecryptionModule; 46 class ContentDecryptionModule;
47 class ContentDecryptionModuleSession; 47 class ContentDecryptionModuleSession;
48 48
49 // References are held by JS and MediaKeys. 49 // References are held by JS and MediaKeys.
50 // Because this object controls the lifetime of the ContentDecryptionModuleSessi on, 50 // Because this object controls the lifetime of the ContentDecryptionModuleSessi on,
51 // it may outlive any references to it as long as the MediaKeys object is alive. 51 // it may outlive any references to it as long as the MediaKeys object is alive.
52 // The ContentDecryptionModuleSession has the same lifetime as this object. 52 // The ContentDecryptionModuleSession has the same lifetime as this object.
53 class MediaKeySession 53 class MediaKeySession
54 : public RefCounted<MediaKeySession>, public ScriptWrappable, public EventTa rget, public ContextLifecycleObserver 54 : public EventTarget, public RefCounted<MediaKeySession>, public ScriptWrapp able, public ContextLifecycleObserver
55 , private ContentDecryptionModuleSessionClient { 55 , private ContentDecryptionModuleSessionClient {
56 public: 56 public:
57 static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, ContentDe cryptionModule*, MediaKeys*); 57 static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, ContentDe cryptionModule*, MediaKeys*);
58 ~MediaKeySession(); 58 ~MediaKeySession();
59 59
60 const String& keySystem() const { return m_keySystem; } 60 const String& keySystem() const { return m_keySystem; }
61 String sessionId() const; 61 String sessionId() const;
62 62
63 void setError(MediaKeyError*); 63 void setError(MediaKeyError*);
64 MediaKeyError* error() { return m_error.get(); } 64 MediaKeyError* error() { return m_error.get(); }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 virtual EventTargetData* eventTargetData() OVERRIDE { return &m_eventTargetD ata; } 114 virtual EventTargetData* eventTargetData() OVERRIDE { return &m_eventTargetD ata; }
115 virtual EventTargetData* ensureEventTargetData() OVERRIDE { return &m_eventT argetData; } 115 virtual EventTargetData* ensureEventTargetData() OVERRIDE { return &m_eventT argetData; }
116 116
117 EventTargetData m_eventTargetData; 117 EventTargetData m_eventTargetData;
118 }; 118 };
119 119
120 } 120 }
121 121
122 #endif // MediaKeySession_h 122 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698