Changeset 63859 in webkit


Ignore:
Timestamp:
Jul 21, 2010 3:12:16 PM (14 years ago)
Author:
scherkus@chromium.org
Message:

2010-07-21 Bo Liu <​boliu@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Add chromium WebMediaPlayer to PlatformMedia
​https://bugs.webkit.org/show_bug.cgi?id=41295

  • platform/graphics/MediaPlayer.h: (WebCore::PlatformMedia::):

2010-07-21 Bo Liu <​boliu@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Add chromium WebMediaPlayer to PlatformMedia
​https://bugs.webkit.org/show_bug.cgi?id=41295

  • WebKit.gyp:
  • public/WebMediaElement.h: Added.
  • src/WebMediaElement.cpp: Added. (WebKit::WebMediaElement::player): (WebKit::WebMediaElement::WebMediaElement): (WebKit::WebMediaElement::operator=): (WebKit::WebMediaElement::operator PassRefPtr<HTMLMediaElement>):
  • src/WebMediaPlayerClientImpl.cpp: (WebKit::WebMediaPlayerClientImpl::fromMediaElement): (WebKit::WebMediaPlayerClientImpl::mediaPlayer): (WebKit::WebMediaPlayerClientImpl::platformLayer): (WebKit::WebMediaPlayerClientImpl::platformMedia):
  • src/WebMediaPlayerClientImpl.h:
Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r63856 r63859  
     12010-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
    1112010-07-21  Simon Fraser  <simon.fraser@apple.com>
    212

  • trunk/WebCore/platform/graphics/MediaPlayer.h

    r63844 r63859  
    5656
    5757class GStreamerGWorld;
     58class MediaPlayerPrivateInterface;
    5859
    5960// Structure that will hold every native
    … …  
    6869        QTMovieVisualContextType,
    6970        GStreamerGWorldType,
     71        ChromiumMediaPlayerType,
    7072    } type;
    7173
    … …  
    7577        QTMovieVisualContext* qtMovieVisualContext;
    7678        GStreamerGWorld* gstreamerGWorld;
     79        MediaPlayerPrivateInterface* chromiumMediaPlayer;
    7780    } media;
    7881};
    … …  
    8689class IntSize;
    8790class MediaPlayer;
    88 class MediaPlayerPrivateInterface;
    8991class String;
    9092class TimeRanges;

  • trunk/WebKit/chromium/ChangeLog

    r63841 r63859  
     12010-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
    1222010-07-21  Finnur Thorarinsson  <finnur.webkit@gmail.com>
    223

  • trunk/WebKit/chromium/WebKit.gyp

    r63676 r63859  
    183183                'public/WebLabelElement.h',
    184184                'public/WebLocalizedString.h',
     185                'public/WebMediaElement.h',
    185186                'public/WebMediaPlayer.h',
    186187                'public/WebMediaPlayerAction.h',
    … …  
    416417                'src/WebKit.cpp',
    417418                'src/WebLabelElement.cpp',
     419                'src/WebMediaElement.cpp',
    418420                'src/WebMediaPlayerClientImpl.cpp',
    419421                'src/WebMediaPlayerClientImpl.h',

  • trunk/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

    r63723 r63859  
    2929#include "WebKit.h"
    3030#include "WebKitClient.h"
     31#include "WebMediaElement.h"
    3132#include "WebMediaPlayer.h"
    3233#include "WebMimeRegistry.h"
    … …  
    8081}
    8182
     83WebMediaPlayerClientImpl* WebMediaPlayerClientImpl::fromMediaElement(const WebMediaElement* element)
     84{
     85    PlatformMedia pm = element->constUnwrap<HTMLMediaElement>()->platformMedia();
     86    return static_cast<WebMediaPlayerClientImpl*>(pm.media.chromiumMediaPlayer);
     87}
     88
     89WebMediaPlayer* WebMediaPlayerClientImpl::mediaPlayer() const
     90{
     91    return m_webMediaPlayer.get();
     92}
     93
    8294// WebMediaPlayerClient --------------------------------------------------------
    8395
    … …  
    168180
    169181#if USE(ACCELERATED_COMPOSITING)
    170 WebCore::PlatformLayer* WebMediaPlayerClientImpl::platformLayer() const
     182PlatformLayer* WebMediaPlayerClientImpl::platformLayer() const
    171183{
    172184    ASSERT(m_supportsAcceleratedCompositing);
    … …  
    174186}
    175187#endif
     188
     189PlatformMedia WebMediaPlayerClientImpl::platformMedia() const
     190{
     191    PlatformMedia pm;
     192    pm.type = PlatformMedia::ChromiumMediaPlayerType;
     193    pm.media.chromiumMediaPlayer = const_cast<WebMediaPlayerClientImpl*>(this);
     194    return pm;
     195}
    176196
    177197void WebMediaPlayerClientImpl::play()

  • trunk/WebKit/chromium/src/WebMediaPlayerClientImpl.h

    r63723 r63859  
    4040namespace WebKit {
    4141
     42class WebMediaElement;
    4243class WebMediaPlayer;
    4344
    … …  
    5051    static void setIsEnabled(bool);
    5152    static void registerSelf(WebCore::MediaEngineRegistrar);
     53
     54    static WebMediaPlayerClientImpl* fromMediaElement(const WebMediaElement* element);
     55
     56    // Returns the encapsulated WebKit::WebMediaPlayer.
     57    WebMediaPlayer* mediaPlayer() const;
    5258
    5359    // WebMediaPlayerClient methods:
    … …  
    7076    virtual WebCore::PlatformLayer* platformLayer() const;
    7177#endif
     78    virtual WebCore::PlatformMedia platformMedia() const;
    7279    virtual void play();
    7380    virtual void pause();
Note: See TracChangeset for help on using the changeset viewer.