Changeset 63859 in webkit
- Timestamp:
- Jul 21, 2010 3:12:16 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r63856 r63859 1 2010-07-21 Bo Liu <boliu@chromium.org> 2 3 Reviewed by Darin Fisher. 4 5 [Chromium] Add chromium WebMediaPlayer to PlatformMedia 6 https://bugs.webkit.org/show_bug.cgi?id=41295 7 8 * platform/graphics/MediaPlayer.h: 9 (WebCore::PlatformMedia::): 10 1 11 2010-07-21 Simon Fraser <simon.fraser@apple.com> 2 12 -
trunk/WebCore/platform/graphics/MediaPlayer.h
r63844 r63859 56 56 57 57 class GStreamerGWorld; 58 class MediaPlayerPrivateInterface; 58 59 59 60 // Structure that will hold every native … … 68 69 QTMovieVisualContextType, 69 70 GStreamerGWorldType, 71 ChromiumMediaPlayerType, 70 72 } type; 71 73 … … 75 77 QTMovieVisualContext* qtMovieVisualContext; 76 78 GStreamerGWorld* gstreamerGWorld; 79 MediaPlayerPrivateInterface* chromiumMediaPlayer; 77 80 } media; 78 81 }; … … 86 89 class IntSize; 87 90 class MediaPlayer; 88 class MediaPlayerPrivateInterface;89 91 class String; 90 92 class TimeRanges; -
trunk/WebKit/chromium/ChangeLog
r63841 r63859 1 2010-07-21 Bo Liu <boliu@chromium.org> 2 3 Reviewed by Darin Fisher. 4 5 [Chromium] Add chromium WebMediaPlayer to PlatformMedia 6 https://bugs.webkit.org/show_bug.cgi?id=41295 7 8 * WebKit.gyp: 9 * public/WebMediaElement.h: Added. 10 * src/WebMediaElement.cpp: Added. 11 (WebKit::WebMediaElement::player): 12 (WebKit::WebMediaElement::WebMediaElement): 13 (WebKit::WebMediaElement::operator=): 14 (WebKit::WebMediaElement::operator PassRefPtr<HTMLMediaElement>): 15 * src/WebMediaPlayerClientImpl.cpp: 16 (WebKit::WebMediaPlayerClientImpl::fromMediaElement): 17 (WebKit::WebMediaPlayerClientImpl::mediaPlayer): 18 (WebKit::WebMediaPlayerClientImpl::platformLayer): 19 (WebKit::WebMediaPlayerClientImpl::platformMedia): 20 * src/WebMediaPlayerClientImpl.h: 21 1 22 2010-07-21 Finnur Thorarinsson <finnur.webkit@gmail.com> 2 23 -
trunk/WebKit/chromium/WebKit.gyp
r63676 r63859 183 183 'public/WebLabelElement.h', 184 184 'public/WebLocalizedString.h', 185 'public/WebMediaElement.h', 185 186 'public/WebMediaPlayer.h', 186 187 'public/WebMediaPlayerAction.h', … … 416 417 'src/WebKit.cpp', 417 418 'src/WebLabelElement.cpp', 419 'src/WebMediaElement.cpp', 418 420 'src/WebMediaPlayerClientImpl.cpp', 419 421 'src/WebMediaPlayerClientImpl.h', -
trunk/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
r63723 r63859 29 29 #include "WebKit.h" 30 30 #include "WebKitClient.h" 31 #include "WebMediaElement.h" 31 32 #include "WebMediaPlayer.h" 32 33 #include "WebMimeRegistry.h" … … 80 81 } 81 82 83 WebMediaPlayerClientImpl* WebMediaPlayerClientImpl::fromMediaElement(const WebMediaElement* element) 84 { 85 PlatformMedia pm = element->constUnwrap<HTMLMediaElement>()->platformMedia(); 86 return static_cast<WebMediaPlayerClientImpl*>(pm.media.chromiumMediaPlayer); 87 } 88 89 WebMediaPlayer* WebMediaPlayerClientImpl::mediaPlayer() const 90 { 91 return m_webMediaPlayer.get(); 92 } 93 82 94 // WebMediaPlayerClient -------------------------------------------------------- 83 95 … … 168 180 169 181 #if USE(ACCELERATED_COMPOSITING) 170 WebCore::PlatformLayer* WebMediaPlayerClientImpl::platformLayer() const182 PlatformLayer* WebMediaPlayerClientImpl::platformLayer() const 171 183 { 172 184 ASSERT(m_supportsAcceleratedCompositing); … … 174 186 } 175 187 #endif 188 189 PlatformMedia WebMediaPlayerClientImpl::platformMedia() const 190 { 191 PlatformMedia pm; 192 pm.type = PlatformMedia::ChromiumMediaPlayerType; 193 pm.media.chromiumMediaPlayer = const_cast<WebMediaPlayerClientImpl*>(this); 194 return pm; 195 } 176 196 177 197 void WebMediaPlayerClientImpl::play() -
trunk/WebKit/chromium/src/WebMediaPlayerClientImpl.h
r63723 r63859 40 40 namespace WebKit { 41 41 42 class WebMediaElement; 42 43 class WebMediaPlayer; 43 44 … … 50 51 static void setIsEnabled(bool); 51 52 static void registerSelf(WebCore::MediaEngineRegistrar); 53 54 static WebMediaPlayerClientImpl* fromMediaElement(const WebMediaElement* element); 55 56 // Returns the encapsulated WebKit::WebMediaPlayer. 57 WebMediaPlayer* mediaPlayer() const; 52 58 53 59 // WebMediaPlayerClient methods: … … 70 76 virtual WebCore::PlatformLayer* platformLayer() const; 71 77 #endif 78 virtual WebCore::PlatformMedia platformMedia() const; 72 79 virtual void play(); 73 80 virtual void pause();
Note: See TracChangeset
for help on using the changeset viewer.