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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.h

Issue 26308002: Fix some WeakPtrFactory members that aren't last (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix weak ptr initialization Created 7 years, 2 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
6 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 6 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 10
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 uint32_t pending_video_decode_request_id_; 171 uint32_t pending_video_decode_request_id_;
172 media::Decryptor::VideoDecodeCB pending_video_decode_cb_; 172 media::Decryptor::VideoDecodeCB pending_video_decode_cb_;
173 173
174 // Cached audio and video input buffers. See MakeMediaBufferResource. 174 // Cached audio and video input buffers. See MakeMediaBufferResource.
175 scoped_refptr<PPB_Buffer_Impl> audio_input_resource_; 175 scoped_refptr<PPB_Buffer_Impl> audio_input_resource_;
176 scoped_refptr<PPB_Buffer_Impl> video_input_resource_; 176 scoped_refptr<PPB_Buffer_Impl> video_input_resource_;
177 177
178 std::queue<uint32_t> free_buffers_; 178 std::queue<uint32_t> free_buffers_;
179 179
180 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
181 base::WeakPtr<ContentDecryptorDelegate> weak_this_;
182
183 // Keep track of audio parameters. 180 // Keep track of audio parameters.
184 media::SampleFormat audio_sample_format_; 181 media::SampleFormat audio_sample_format_;
185 int audio_samples_per_second_; 182 int audio_samples_per_second_;
186 int audio_channel_count_; 183 int audio_channel_count_;
187 int audio_bytes_per_frame_; 184 int audio_bytes_per_frame_;
188 185
186 base::WeakPtr<ContentDecryptorDelegate> weak_this_;
187 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
188
189 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate); 189 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
190 }; 190 };
191 191
192 } // namespace content 192 } // namespace content
193 193
194 #endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 194 #endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/renderer/pepper/pepper_flash_renderer_host.cc ('k') | content/renderer/pepper/content_decryptor_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698