⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 284858 in webkit


Ignore:
Timestamp:
Oct 26, 2021, 12:36:09 AM (5 years ago)
Author:
Adrian Perez de Castro
Message:

Multiple build issues with ENABLE_VIDEO=OFF
​https://bugs.webkit.org/show_bug.cgi?id=232264

Reviewed by Carlos Garcia Campos.

.:

  • Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_SESSION depend on ENABLE_VIDEO.

Source/WebCore:

No new tests needed.

  • accessibility/AXObjectCache.cpp:

(WebCore::isSimpleImage): Guard usage of HTMLMediaElement with ENABLE(VIDEO).

  • page/EventHandler.cpp:

(WebCore::EventHandler::textRecognitionCandidateElement const): Ditto.

  • platform/graphics/BifurcatedGraphicsContext.cpp: Ditto.
  • platform/graphics/displaylists/DisplayListRecorder.h: Guard usage of MediaPlayer with

ENABLE(VIDEO).

  • platform/graphics/displaylists/DisplayListRecorderImpl.cpp: Ditto.
  • platform/graphics/displaylists/DisplayListRecorderImpl.h: Ditto.

Source/WebKit:

  • WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp:

(WebKit::createShareableBitmap): Guard usage of RenderVideo with ENABLE(VIDEO).

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r284820 r284858  
     12021-10-26  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Multiple build issues with ENABLE_VIDEO=OFF
     4        https://bugs.webkit.org/show_bug.cgi?id=232264
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_SESSION depend on ENABLE_VIDEO.
     9
    1102021-10-25  Jonathan Bedard  <jbedard@apple.com>
    211

  • trunk/Source/WebCore/ChangeLog

    r284857 r284858  
     12021-10-26  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Multiple build issues with ENABLE_VIDEO=OFF
     4        https://bugs.webkit.org/show_bug.cgi?id=232264
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        No new tests needed.
     9
     10        * accessibility/AXObjectCache.cpp:
     11        (WebCore::isSimpleImage): Guard usage of HTMLMediaElement with ENABLE(VIDEO).
     12        * page/EventHandler.cpp:
     13        (WebCore::EventHandler::textRecognitionCandidateElement const): Ditto.
     14        * platform/graphics/BifurcatedGraphicsContext.cpp: Ditto.
     15        * platform/graphics/displaylists/DisplayListRecorder.h: Guard usage of MediaPlayer with
     16        ENABLE(VIDEO).
     17        * platform/graphics/displaylists/DisplayListRecorderImpl.cpp: Ditto.
     18        * platform/graphics/displaylists/DisplayListRecorderImpl.h: Ditto.
     19
    1202021-10-26  Fujii Hironori  <Hironori.Fujii@sony.com>
    221

  • trunk/Source/WebCore/accessibility/AXObjectCache.cpp

    r284675 r284858  
    532532        return false;
    533533
     534#if ENABLE(VIDEO)
    534535    // Exclude video and audio elements.
    535536    if (is<HTMLMediaElement>(node))
    536537        return false;
     538#endif // ENABLE(VIDEO)
    537539
    538540    return true;

  • trunk/Source/WebCore/page/EventHandler.cpp

    r284857 r284858  
    25442544#endif
    25452545
     2546#if ENABLE(VIDEO)
    25462547    if (is<HTMLVideoElement>(*candidateElement))
    25472548        return nullptr;
     2549#endif // ENABLE(VIDEO)
    25482550
    25492551    return candidateElement;

  • trunk/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp

    r284003 r284858  
    298298}
    299299
     300#if ENABLE(VIDEO)
    300301void BifurcatedGraphicsContext::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
    301302{
    … …  
    303304    m_secondaryContext.paintFrameForMedia(player, destination);
    304305}
     306#endif // ENABLE(VIDEO)
    305307
    306308void BifurcatedGraphicsContext::scale(const FloatSize& scale)

  • trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h

    r284003 r284858  
    117117    virtual void recordFillPath(const Path&) = 0;
    118118    virtual void recordFillEllipse(const FloatRect&) = 0;
     119#if ENABLE(VIDEO)
    119120    virtual void recordPaintFrameForMedia(MediaPlayer&, const FloatRect& destination) = 0;
     121#endif
    120122    virtual void recordStrokeRect(const FloatRect&, float) = 0;
    121123#if ENABLE(INLINE_PATH_DATA)

  • trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.cpp

    r283995 r284858  
    343343}
    344344
     345#if ENABLE(VIDEO)
    345346void RecorderImpl::recordPaintFrameForMedia(MediaPlayer& player, const FloatRect& destination)
    346347{
    347348    append<PaintFrameForMedia>(player, destination);
    348349}
     350#endif // ENABLE(VIDEO)
    349351
    350352void RecorderImpl::recordStrokeRect(const FloatRect& rect, float width)

  • trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.h

    r283957 r284858  
    115115    void recordFillPath(const Path&) final;
    116116    void recordFillEllipse(const FloatRect&) final;
     117#if ENABLE(VIDEO)
    117118    void recordPaintFrameForMedia(MediaPlayer&, const FloatRect& destination) final;
     119#endif
    118120    void recordStrokeRect(const FloatRect&, float) final;
    119121#if ENABLE(INLINE_PATH_DATA)

  • trunk/Source/WebKit/ChangeLog

    r284848 r284858  
     12021-10-26  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Multiple build issues with ENABLE_VIDEO=OFF
     4        https://bugs.webkit.org/show_bug.cgi?id=232264
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp:
     9        (WebKit::createShareableBitmap): Guard usage of RenderVideo with ENABLE(VIDEO).
     10
    1112021-10-25  John Wilander  <wilander@apple.com>
    212

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp

    r282740 r284858  
    7272    }
    7373
     74#if ENABLE(VIDEO)
    7475    if (is<RenderVideo>(renderImage)) {
    7576        auto& renderVideo = downcast<RenderVideo>(renderImage);
    … …  
    9495        return bitmap;
    9596    }
     97#endif // ENABLE(VIDEO)
    9698
    9799    auto* cachedImage = renderImage.cachedImage();

  • trunk/Source/cmake/WebKitFeatures.cmake

    r284512 r284858  
    251251    WEBKIT_OPTION_DEPEND(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS ENABLE_REMOTE_INSPECTOR)
    252252    WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_CONTROLS_SCRIPT ENABLE_VIDEO)
     253    WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SESSION ENABLE_VIDEO)
    253254    WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SOURCE ENABLE_VIDEO)
    254255    WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_STREAM ENABLE_VIDEO)
Note: See TracChangeset for help on using the changeset viewer.