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

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

Issue 463413002: Oilpan: Fix RawPtr to Member in MediaKeySession::PendingAction (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 return new PendingAction(Message, event); 98 return new PendingAction(Message, event);
99 } 99 }
100 100
101 ~PendingAction() 101 ~PendingAction()
102 { 102 {
103 } 103 }
104 104
105 void trace(Visitor* visitor) 105 void trace(Visitor* visitor)
106 { 106 {
107 visitor->trace(m_result); 107 visitor->trace(m_result);
108 visitor->trace(m_event);
108 } 109 }
109 110
110 private: 111 private:
111 PendingAction(Type type, ContentDecryptionModuleResult* result, PassRefPtr<A rrayBuffer> data) 112 PendingAction(Type type, ContentDecryptionModuleResult* result, PassRefPtr<A rrayBuffer> data)
112 : m_type(type) 113 : m_type(type)
113 , m_result(result) 114 , m_result(result)
114 , m_data(data) 115 , m_data(data)
115 { 116 {
116 } 117 }
117 118
118 PendingAction(Type type, PassRefPtrWillBeRawPtr<Event> event) 119 PendingAction(Type type, PassRefPtrWillBeRawPtr<Event> event)
119 : m_type(type) 120 : m_type(type)
120 , m_event(event) 121 , m_event(event)
121 { 122 {
122 } 123 }
123 124
124 const Type m_type; 125 const Type m_type;
125 const Member<ContentDecryptionModuleResult> m_result; 126 const Member<ContentDecryptionModuleResult> m_result;
126 const RefPtr<ArrayBuffer> m_data; 127 const RefPtr<ArrayBuffer> m_data;
127 const RefPtrWillBeRawPtr<Event> m_event; 128 const RefPtrWillBeMember<Event> m_event;
128 }; 129 };
129 130
130 // This class allows a MediaKeySession object to be created asynchronously. 131 // This class allows a MediaKeySession object to be created asynchronously.
131 class MediaKeySessionInitializer : public ScriptPromiseResolver { 132 class MediaKeySessionInitializer : public ScriptPromiseResolver {
132 WTF_MAKE_NONCOPYABLE(MediaKeySessionInitializer); 133 WTF_MAKE_NONCOPYABLE(MediaKeySessionInitializer);
133 134
134 public: 135 public:
135 static ScriptPromise create(ScriptState*, MediaKeys*, const String& initData Type, PassRefPtr<ArrayBuffer> initData, const String& sessionType); 136 static ScriptPromise create(ScriptState*, MediaKeys*, const String& initData Type, PassRefPtr<ArrayBuffer> initData, const String& sessionType);
136 virtual ~MediaKeySessionInitializer(); 137 virtual ~MediaKeySessionInitializer();
137 138
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 { 624 {
624 visitor->trace(m_error); 625 visitor->trace(m_error);
625 visitor->trace(m_asyncEventQueue); 626 visitor->trace(m_asyncEventQueue);
626 visitor->trace(m_pendingActions); 627 visitor->trace(m_pendingActions);
627 visitor->trace(m_keys); 628 visitor->trace(m_keys);
628 visitor->trace(m_closedPromise); 629 visitor->trace(m_closedPromise);
629 EventTargetWithInlineData::trace(visitor); 630 EventTargetWithInlineData::trace(visitor);
630 } 631 }
631 632
632 } 633 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698