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

Side by Side Diff: webkit/glue/webmediaplayer_impl.h

Issue 8382012: Fix shutdown crash when WebMediaPlayerImpl is destroyed after RenderViewImpl is. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test callers Created 9 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
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/glue/webmediaplayer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains PipelineImpl which is the actual media player pipeline, it glues 6 // It contains PipelineImpl which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // PipelineImpl would creates multiple threads and access some public methods 8 // PipelineImpl would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // 5. Null audio renderer 98 // 5. Null audio renderer
99 // The video renderer provided by this class is using the graphics context 99 // The video renderer provided by this class is using the graphics context
100 // provided by WebKit to perform renderering. The simple data source does 100 // provided by WebKit to perform renderering. The simple data source does
101 // resource loading by loading the whole resource object into memory. Null 101 // resource loading by loading the whole resource object into memory. Null
102 // audio renderer is a fake audio device that plays silence. Provider of the 102 // audio renderer is a fake audio device that plays silence. Provider of the
103 // |collection| can override the default filters by adding extra filters to 103 // |collection| can override the default filters by adding extra filters to
104 // |collection| before calling this method. 104 // |collection| before calling this method.
105 // 105 //
106 // Callers must call |Initialize()| before they can use the object. 106 // Callers must call |Initialize()| before they can use the object.
107 WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client, 107 WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
108 WebMediaPlayerDelegate* delegate, 108 base::WeakPtr<WebMediaPlayerDelegate> delegate,
109 media::FilterCollection* collection, 109 media::FilterCollection* collection,
110 media::MessageLoopFactory* message_loop_factory, 110 media::MessageLoopFactory* message_loop_factory,
111 MediaStreamClient* media_stream_client, 111 MediaStreamClient* media_stream_client,
112 media::MediaLog* media_log); 112 media::MediaLog* media_log);
113 virtual ~WebMediaPlayerImpl(); 113 virtual ~WebMediaPlayerImpl();
114 114
115 // Finalizes initialization of the object. 115 // Finalizes initialization of the object.
116 bool Initialize( 116 bool Initialize(
117 WebKit::WebFrame* frame, 117 WebKit::WebFrame* frame,
118 bool use_simple_data_source, 118 bool use_simple_data_source,
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 // Seek gets pending if another seek is in progress. Only last pending seek 253 // Seek gets pending if another seek is in progress. Only last pending seek
254 // will have effect. 254 // will have effect.
255 bool pending_seek_; 255 bool pending_seek_;
256 float pending_seek_seconds_; 256 float pending_seek_seconds_;
257 257
258 WebKit::WebMediaPlayerClient* client_; 258 WebKit::WebMediaPlayerClient* client_;
259 259
260 scoped_refptr<WebMediaPlayerProxy> proxy_; 260 scoped_refptr<WebMediaPlayerProxy> proxy_;
261 261
262 WebMediaPlayerDelegate* delegate_; 262 base::WeakPtr<WebMediaPlayerDelegate> delegate_;
263 263
264 MediaStreamClient* media_stream_client_; 264 MediaStreamClient* media_stream_client_;
265 265
266 #if WEBKIT_USING_CG 266 #if WEBKIT_USING_CG
267 scoped_ptr<skia::PlatformCanvas> skia_canvas_; 267 scoped_ptr<skia::PlatformCanvas> skia_canvas_;
268 #endif 268 #endif
269 269
270 scoped_refptr<media::MediaLog> media_log_; 270 scoped_refptr<media::MediaLog> media_log_;
271 271
272 bool incremented_externally_allocated_memory_; 272 bool incremented_externally_allocated_memory_;
273 273
274 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 274 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
275 }; 275 };
276 276
277 } // namespace webkit_glue 277 } // namespace webkit_glue
278 278
279 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 279 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/glue/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698