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

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

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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
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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 virtual void exitFullscreen(); 139 virtual void exitFullscreen();
140 virtual bool canEnterFullscreen() const; 140 virtual bool canEnterFullscreen() const;
141 #endif 141 #endif
142 142
143 #if ENABLE(WEB_AUDIO) 143 #if ENABLE(WEB_AUDIO)
144 virtual WebCore::AudioSourceProvider* audioSourceProvider(); 144 virtual WebCore::AudioSourceProvider* audioSourceProvider();
145 #endif 145 #endif
146 146
147 virtual bool supportsAcceleratedRendering() const; 147 virtual bool supportsAcceleratedRendering() const;
148 148
149 #if ENABLE(ENCRYPTED_MEDIA)
150 virtual WebCore::MediaPlayer::MediaKeyException generateKeyRequest(const Str ing& keySystem, const unsigned char* initData, unsigned initDataLength) OVERRIDE ; 149 virtual WebCore::MediaPlayer::MediaKeyException generateKeyRequest(const Str ing& keySystem, const unsigned char* initData, unsigned initDataLength) OVERRIDE ;
151 virtual WebCore::MediaPlayer::MediaKeyException addKey(const String& keySyst em, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) OVERRIDE; 150 virtual WebCore::MediaPlayer::MediaKeyException addKey(const String& keySyst em, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) OVERRIDE;
152 virtual WebCore::MediaPlayer::MediaKeyException cancelKeyRequest(const Strin g& keySystem, const String& sessionId) OVERRIDE; 151 virtual WebCore::MediaPlayer::MediaKeyException cancelKeyRequest(const Strin g& keySystem, const String& sessionId) OVERRIDE;
153 #endif
154 152
155 protected: 153 protected:
156 WebMediaPlayerClientImpl(); 154 WebMediaPlayerClientImpl();
157 private: 155 private:
158 void startDelayedLoad(); 156 void startDelayedLoad();
159 void loadRequested(); 157 void loadRequested();
160 void loadInternal(); 158 void loadInternal();
161 159
162 static PassOwnPtr<WebCore::MediaPlayerPrivateInterface> create(WebCore::Medi aPlayer*); 160 static PassOwnPtr<WebCore::MediaPlayerPrivateInterface> create(WebCore::Medi aPlayer*);
163 #if ENABLE(ENCRYPTED_MEDIA)
164 static WebCore::MediaPlayer::SupportsType supportsType( 161 static WebCore::MediaPlayer::SupportsType supportsType(
165 const WTF::String& type, const WTF::String& codecs, const String& keySys tem, const WebCore::KURL&); 162 const WTF::String& type, const WTF::String& codecs, const String& keySys tem, const WebCore::KURL&);
166 #else
167 static WebCore::MediaPlayer::SupportsType supportsType(
168 const WTF::String& type, const WTF::String& codecs, const WebCore::KURL& );
169 #endif
170 bool acceleratedRenderingInUse(); 163 bool acceleratedRenderingInUse();
171 164
172 #if defined(OS_ANDROID) 165 #if defined(OS_ANDROID)
173 // FIXME: This path "only works" on Android. It is a workaround for the prob lem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES 166 // FIXME: This path "only works" on Android. It is a workaround for the prob lem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
174 // texture internally. It should be removed and replaced by the normal paint path. 167 // texture internally. It should be removed and replaced by the normal paint path.
175 // https://code.google.com/p/skia/issues/detail?id=1189 168 // https://code.google.com/p/skia/issues/detail?id=1189
176 void paintOnAndroid(WebCore::GraphicsContext* context, WebCore::GraphicsCont ext3D* context3D, const WebCore::IntRect& rect, uint8_t alpha); 169 void paintOnAndroid(WebCore::GraphicsContext* context, WebCore::GraphicsCont ext3D* context3D, const WebCore::IntRect& rect, uint8_t alpha);
177 SkAutoTUnref<GrTexture> m_texture; 170 SkAutoTUnref<GrTexture> m_texture;
178 SkBitmap m_bitmap; 171 SkBitmap m_bitmap;
179 #endif 172 #endif
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 229
237 AudioSourceProviderImpl m_audioSourceProvider; 230 AudioSourceProviderImpl m_audioSourceProvider;
238 #endif 231 #endif
239 232
240 RefPtr<WebCore::WebKitMediaSource> m_mediaSource; 233 RefPtr<WebCore::WebKitMediaSource> m_mediaSource;
241 }; 234 };
242 235
243 } // namespace WebKit 236 } // namespace WebKit
244 237
245 #endif 238 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/AssertMatchingEnums.cpp ('k') | Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698