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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 448063003: media: Fix not-thread-safe access to variables in android media code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 // lock. So this is only used for media source. Will apply this to regular 299 // lock. So this is only used for media source. Will apply this to regular
300 // media tag once http://crbug.com/247892 is fixed. 300 // media tag once http://crbug.com/247892 is fixed.
301 base::WeakPtr<WebMediaPlayerDelegate> delegate_; 301 base::WeakPtr<WebMediaPlayerDelegate> delegate_;
302 302
303 // Save the list of buffered time ranges. 303 // Save the list of buffered time ranges.
304 blink::WebTimeRanges buffered_; 304 blink::WebTimeRanges buffered_;
305 305
306 // Size of the video. 306 // Size of the video.
307 blink::WebSize natural_size_; 307 blink::WebSize natural_size_;
308 308
309 // Size that has been sent to StreamTexture.
310 blink::WebSize cached_stream_texture_size_;
311
312 // The video frame object used for rendering by the compositor. 309 // The video frame object used for rendering by the compositor.
313 scoped_refptr<media::VideoFrame> current_frame_; 310 scoped_refptr<media::VideoFrame> current_frame_;
314 base::Lock current_frame_lock_; 311 base::Lock current_frame_lock_;
315 312
316 base::ThreadChecker main_thread_checker_; 313 base::ThreadChecker main_thread_checker_;
317 314
318 // Message loop for media thread. 315 // Message loop for media thread.
319 const scoped_refptr<base::MessageLoopProxy> media_loop_; 316 const scoped_refptr<base::MessageLoopProxy> media_loop_;
320 317
321 // URL of the media file to be fetched. 318 // URL of the media file to be fetched.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 449
453 // NOTE: Weak pointers must be invalidated before all other member variables. 450 // NOTE: Weak pointers must be invalidated before all other member variables.
454 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 451 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
455 452
456 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 453 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
457 }; 454 };
458 455
459 } // namespace content 456 } // namespace content
460 457
461 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 458 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698