Changeset 206863 in webkit


Ignore:
Timestamp:
Oct 6, 2016 6:07:56 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Fix build with GSTREAMER_GL enabled and ACCELERATED_2D_CANVAS disabled
​https://bugs.webkit.org/show_bug.cgi?id=163008

Patch by Miguel Gomez <​magomez@igalia.com> on 2016-10-06
Reviewed by Carlos Garcia Campos.

Put functions using cairo-gl behind appropriate guards.

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::paintToCairoSurface): Deleted.

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r206862 r206863  
     12016-10-06  Miguel Gomez  <magomez@igalia.com>
     2
     3        [GTK] Fix build with GSTREAMER_GL enabled and ACCELERATED_2D_CANVAS disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=163008
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Put functions using cairo-gl behind appropriate guards.
     9
     10        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     11        (WebCore::MediaPlayerPrivateGStreamerBase::paintToCairoSurface): Deleted.
     12        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
     13
    1142016-10-06  Miguel Gomez  <magomez@igalia.com>
    215

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r206862 r206863  
    714714
    715715#if USE(GSTREAMER_GL)
     716#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    716717// This should be called with the sample mutex locked.
    717718GLContext* MediaPlayerPrivateGStreamerBase::prepareContextForCairoPaint(GstVideoInfo& videoInfo, IntSize& size, IntSize& rotatedSize)
    … …  
    780781    return true;
    781782}
     783#endif // USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    782784
    783785bool MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture(GraphicsContext3D* context, Platform3DObject outputTexture, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type, bool premultiplyAlpha, bool flipY)

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

    r206862 r206863  
    134134    GstElement* createGLAppSink();
    135135    GstElement* createVideoSinkGL();
     136#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
    136137    GLContext* prepareContextForCairoPaint(GstVideoInfo&, IntSize&, IntSize&);
    137138    bool paintToCairoSurface(cairo_surface_t*, cairo_device_t*, GstVideoInfo&, const IntSize&, const IntSize&, bool);
     139#endif
    138140#endif
    139141
Note: See TracChangeset for help on using the changeset viewer.