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

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.h

Issue 206283004: Remove WebMediaPlayerClient{Impl}::needsWebLayerForVideo() as compositing is always enabled. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 9 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 | Source/web/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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 virtual double volume() const OVERRIDE; 78 virtual double volume() const OVERRIDE;
79 virtual void playbackStateChanged() OVERRIDE; 79 virtual void playbackStateChanged() OVERRIDE;
80 virtual WebMediaPlayer::Preload preload() const OVERRIDE; 80 virtual WebMediaPlayer::Preload preload() const OVERRIDE;
81 81
82 // WebEncryptedMediaPlayerClient methods: 82 // WebEncryptedMediaPlayerClient methods:
83 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) OVERRIDE; 83 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) OVERRIDE;
84 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) OVERRIDE; 84 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) OVERRIDE;
85 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) OVERRIDE; 85 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) OVERRIDE;
86 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) OVERRIDE; 86 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) OVERRIDE;
87 87
88 virtual bool needsWebLayerForVideo() const OVERRIDE;
89 virtual void setWebLayer(WebLayer*) OVERRIDE; 88 virtual void setWebLayer(WebLayer*) OVERRIDE;
90 virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE; 89 virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;
91 virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE; 90 virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;
92 virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE; 91 virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;
93 virtual void requestFullscreen() OVERRIDE; 92 virtual void requestFullscreen() OVERRIDE;
94 virtual void requestSeek(double) OVERRIDE; 93 virtual void requestSeek(double) OVERRIDE;
95 94
96 // MediaPlayer methods: 95 // MediaPlayer methods:
97 virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE; 96 virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
98 virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMedia Player::CORSMode) OVERRIDE; 97 virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMedia Player::CORSMode) OVERRIDE;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #endif 134 #endif
136 135
137 private: 136 private:
138 explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*); 137 explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
139 138
140 WebCore::HTMLMediaElement& mediaElement() const; 139 WebCore::HTMLMediaElement& mediaElement() const;
141 140
142 WebCore::MediaPlayerClient* m_client; 141 WebCore::MediaPlayerClient* m_client;
143 OwnPtr<WebMediaPlayer> m_webMediaPlayer; 142 OwnPtr<WebMediaPlayer> m_webMediaPlayer;
144 WebCore::MediaPlayer::Preload m_preload; 143 WebCore::MediaPlayer::Preload m_preload;
145 bool m_needsWebLayerForVideo;
146 double m_rate; 144 double m_rate;
147 145
148 #if OS(ANDROID) 146 #if OS(ANDROID)
149 // 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 147 // 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
150 // texture internally. It should be removed and replaced by the normal paint path. 148 // texture internally. It should be removed and replaced by the normal paint path.
151 // https://code.google.com/p/skia/issues/detail?id=1189 149 // https://code.google.com/p/skia/issues/detail?id=1189
152 void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint 8_t alpha); 150 void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint 8_t alpha);
153 SkBitmap m_bitmap; 151 SkBitmap m_bitmap;
154 bool m_usePaintOnAndroid; 152 bool m_usePaintOnAndroid;
155 #endif 153 #endif
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 Mutex provideInputLock; 197 Mutex provideInputLock;
200 }; 198 };
201 199
202 AudioSourceProviderImpl m_audioSourceProvider; 200 AudioSourceProviderImpl m_audioSourceProvider;
203 #endif 201 #endif
204 }; 202 };
205 203
206 } // namespace blink 204 } // namespace blink
207 205
208 #endif 206 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698