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

Side by Side Diff: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

Issue 13685002: Enable video painting on Canvas for Chrome on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressing Ken's comments. Created 7 years, 8 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
« no previous file with comments | « no previous file | Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WebMediaPlayerClientImpl_h 31 #ifndef WebMediaPlayerClientImpl_h
32 #define WebMediaPlayerClientImpl_h 32 #define WebMediaPlayerClientImpl_h
33 33
34 #if ENABLE(VIDEO) 34 #if ENABLE(VIDEO)
35 35
36 #include "AudioSourceProvider.h" 36 #include "AudioSourceProvider.h"
37 #include "MediaPlayerPrivate.h" 37 #include "MediaPlayerPrivate.h"
38 #if defined(OS_ANDROID)
39 #include "SkRefCnt.h"
40 #include "SkBitmap.h"
41 #endif
38 #include "WebAudioSourceProviderClient.h" 42 #include "WebAudioSourceProviderClient.h"
39 #include "WebMediaPlayerClient.h" 43 #include "WebMediaPlayerClient.h"
40 #include <wtf/OwnPtr.h> 44 #include <wtf/OwnPtr.h>
41 #include <wtf/PassOwnPtr.h> 45 #include <wtf/PassOwnPtr.h>
42 46
43 namespace WebCore { class AudioSourceProviderClient; } 47 namespace WebCore { class AudioSourceProviderClient; }
44 48
45 namespace WebKit { 49 namespace WebKit {
46 50
47 class WebHelperPluginImpl; 51 class WebHelperPluginImpl;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 static WebCore::MediaPlayer::SupportsType supportsType( 168 static WebCore::MediaPlayer::SupportsType supportsType(
165 const WTF::String& type, const WTF::String& codecs, const String& keySys tem, const WebCore::KURL&); 169 const WTF::String& type, const WTF::String& codecs, const String& keySys tem, const WebCore::KURL&);
166 #else 170 #else
167 static WebCore::MediaPlayer::SupportsType supportsType( 171 static WebCore::MediaPlayer::SupportsType supportsType(
168 const WTF::String& type, const WTF::String& codecs, const WebCore::KURL& ); 172 const WTF::String& type, const WTF::String& codecs, const WebCore::KURL& );
169 #endif 173 #endif
170 #if USE(ACCELERATED_COMPOSITING) 174 #if USE(ACCELERATED_COMPOSITING)
171 bool acceleratedRenderingInUse(); 175 bool acceleratedRenderingInUse();
172 #endif 176 #endif
173 177
178 #if defined(OS_ANDROID)
179 void paintOnAndroid(WebCore::GraphicsContext* context, WebCore::GraphicsCont ext3D* context3D, const WebCore::IntRect& rect, uint8_t alpha);
Ken Russell (switch to Gerrit) 2013/04/09 00:07:28 Please add a big FIXME here indicating that the re
180 SkAutoTUnref<GrTexture> m_texture;
181 SkBitmap m_bitmap;
182 #endif
183
174 WebCore::MediaPlayer* m_mediaPlayer; 184 WebCore::MediaPlayer* m_mediaPlayer;
175 OwnPtr<WebMediaPlayer> m_webMediaPlayer; 185 OwnPtr<WebMediaPlayer> m_webMediaPlayer;
176 WebCore::KURL m_url; 186 WebCore::KURL m_url;
177 bool m_delayingLoad; 187 bool m_delayingLoad;
178 WebCore::MediaPlayer::Preload m_preload; 188 WebCore::MediaPlayer::Preload m_preload;
179 RefPtr<WebHelperPluginImpl> m_helperPlugin; 189 RefPtr<WebHelperPluginImpl> m_helperPlugin;
180 WebLayer* m_videoLayer; 190 WebLayer* m_videoLayer;
181 bool m_opaque; 191 bool m_opaque;
182 bool m_needsWebLayerForVideo; 192 bool m_needsWebLayerForVideo;
183 static bool m_isEnabled; 193 static bool m_isEnabled;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 #if ENABLE(MEDIA_SOURCE) 242 #if ENABLE(MEDIA_SOURCE)
233 RefPtr<WebCore::MediaSource> m_mediaSource; 243 RefPtr<WebCore::MediaSource> m_mediaSource;
234 #endif 244 #endif
235 }; 245 };
236 246
237 } // namespace WebKit 247 } // namespace WebKit
238 248
239 #endif 249 #endif
240 250
241 #endif 251 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698