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

Side by Side Diff: webkit/media/android/webmediaplayer_android.h

Issue 10828079: Fix a renderer crash when media elements get deleted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing merge conflicts Created 8 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 | webkit/media/android/webmediaplayer_android.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) 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 WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 // Functions that implements media player control. 146 // Functions that implements media player control.
147 void PlayInternal(); 147 void PlayInternal();
148 void PauseInternal(); 148 void PauseInternal();
149 void SeekInternal(float seconds); 149 void SeekInternal(float seconds);
150 150
151 // Helper methods for posting task for setting states and update WebKit. 151 // Helper methods for posting task for setting states and update WebKit.
152 void UpdateNetworkState(WebKit::WebMediaPlayer::NetworkState state); 152 void UpdateNetworkState(WebKit::WebMediaPlayer::NetworkState state);
153 void UpdateReadyState(WebKit::WebMediaPlayer::ReadyState state); 153 void UpdateReadyState(WebKit::WebMediaPlayer::ReadyState state);
154 154
155 // Methods for creation and deletion of stream texture.
156 void CreateStreamTexture();
157 void DestroyStreamTexture();
158
159 // whether the current process is incognito mode 155 // whether the current process is incognito mode
160 static bool incognito_mode_; 156 static bool incognito_mode_;
161 157
162 WebKit::WebFrame* frame_; 158 WebKit::WebFrame* frame_;
163 159
164 WebKit::WebMediaPlayerClient* const client_; 160 WebKit::WebMediaPlayerClient* const client_;
165 161
166 // Save the list of buffered time ranges. 162 // Save the list of buffered time ranges.
167 WebKit::WebTimeRanges buffered_; 163 WebKit::WebTimeRanges buffered_;
168 164
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 // Object for calling back the compositor thread to repaint the video when a 237 // Object for calling back the compositor thread to repaint the video when a
242 // frame available. It should be initialized on the compositor thread. 238 // frame available. It should be initialized on the compositor thread.
243 scoped_ptr<webkit_media::StreamTextureProxy> stream_texture_proxy_; 239 scoped_ptr<webkit_media::StreamTextureProxy> stream_texture_proxy_;
244 240
245 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 241 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
246 }; 242 };
247 243
248 } // namespace webkit_media 244 } // namespace webkit_media
249 245
250 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 246 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698