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

Side by Side Diff: webkit/media/webmediaplayer_proxy.h

Issue 8599004: Fix webkit_media::WebMediaPlayerProxy memory leak due to circular refcounting. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // Notify |webmediaplayer_| that there's a network event. 96 // Notify |webmediaplayer_| that there's a network event.
97 void NetworkEventTask(bool network_activity); 97 void NetworkEventTask(bool network_activity);
98 98
99 // The render message loop where WebKit lives. 99 // The render message loop where WebKit lives.
100 MessageLoop* render_loop_; 100 MessageLoop* render_loop_;
101 WebMediaPlayerImpl* webmediaplayer_; 101 WebMediaPlayerImpl* webmediaplayer_;
102 102
103 base::Lock data_sources_lock_; 103 base::Lock data_sources_lock_;
104 typedef std::list<scoped_refptr<WebDataSource> > DataSourceList; 104 typedef std::list<scoped_refptr<WebDataSource> > DataSourceList;
105 DataSourceList data_sources_; 105 DataSourceList data_sources_;
106 WebDataSourceBuildObserverHack build_observer_;
107 106
108 scoped_refptr<WebVideoRenderer> video_renderer_; 107 scoped_refptr<WebVideoRenderer> video_renderer_;
109 108
110 base::Lock lock_; 109 base::Lock lock_;
111 int outstanding_repaints_; 110 int outstanding_repaints_;
112 111
113 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 112 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
114 113
115 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); 114 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
116 }; 115 };
117 116
118 } // namespace webkit_media 117 } // namespace webkit_media
119 118
120 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 119 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698