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

Changeset 267573 in webkit


Ignore:
Timestamp:
Sep 25, 2020, 9:24:33 AM (6 years ago)
Author:
Peng Liu
Message:

Clean up VideoLayerManagerObjC
​https://bugs.webkit.org/show_bug.cgi?id=216946

Reviewed by Eric Carlson.

Remove m_videoInlineFrame. Also, change the order of some variables
and functions to put related things together.

No new tests since no functional changes.

  • platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h:
  • platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm:

(WebCore::VideoLayerManagerObjC::setVideoLayer):
(WebCore::VideoLayerManagerObjC::didDestroyVideoLayer):
(WebCore::VideoLayerManagerObjC::setVideoFullscreenLayer):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r267572 r267573  
     12020-09-25  Peng Liu  <peng.liu6@apple.com>
     2
     3        Clean up VideoLayerManagerObjC
     4        https://bugs.webkit.org/show_bug.cgi?id=216946
     5
     6        Reviewed by Eric Carlson.
     7
     8        Remove m_videoInlineFrame. Also, change the order of some variables
     9        and functions to put related things together.
     10
     11        No new tests since no functional changes.
     12
     13        * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h:
     14        * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm:
     15        (WebCore::VideoLayerManagerObjC::setVideoLayer):
     16        (WebCore::VideoLayerManagerObjC::didDestroyVideoLayer):
     17        (WebCore::VideoLayerManagerObjC::setVideoFullscreenLayer):
     18
    1192020-09-25  Zalan Bujtas  <zalan@apple.com>
    220

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h

    r267491 r267573  
    4747
    4848    PlatformLayer *videoInlineLayer() const { return m_videoInlineLayer.get(); }
     49
    4950    void setVideoLayer(PlatformLayer *, IntSize contentSize);
    5051    void didDestroyVideoLayer();
    … …  
    5253#if ENABLE(VIDEO_PRESENTATION_MODE)
    5354    PlatformLayer *videoFullscreenLayer() const { return m_videoFullscreenLayer.get(); }
     55    void setVideoFullscreenLayer(PlatformLayer *, WTF::Function<void()>&& completionHandler, NativeImagePtr);
    5456    FloatRect videoFullscreenFrame() const { return m_videoFullscreenFrame; }
    55     void setVideoFullscreenLayer(PlatformLayer *, WTF::Function<void()>&& completionHandler, NativeImagePtr);
     57    void setVideoFullscreenFrame(FloatRect);
    5658    void updateVideoFullscreenInlineImage(NativeImagePtr);
    57     void setVideoFullscreenFrame(FloatRect);
    5859#endif
    5960
    … …  
    7172    const void* m_logIdentifier;
    7273
    73     RetainPtr<PlatformLayer> m_textTrackRepresentationLayer;
    7474    RetainPtr<WebVideoContainerLayer> m_videoInlineLayer;
    75     FloatRect m_videoInlineFrame;
    7675#if ENABLE(VIDEO_PRESENTATION_MODE)
    7776    RetainPtr<PlatformLayer> m_videoFullscreenLayer;
    7877    FloatRect m_videoFullscreenFrame;
    7978#endif
     79    RetainPtr<PlatformLayer> m_textTrackRepresentationLayer;
     80
    8081    RetainPtr<PlatformLayer> m_videoLayer;
    8182};

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm

    r267491 r267573  
    5959    m_videoInlineLayer = adoptNS([[WebVideoContainerLayer alloc] init]);
    6060    [m_videoInlineLayer setName:@"WebVideoContainerLayer"];
    61     m_videoInlineFrame = CGRectMake(0, 0, contentSize.width(), contentSize.height());
    62     [m_videoInlineLayer setFrame:m_videoInlineFrame];
     61    [m_videoInlineLayer setFrame:CGRectMake(0, 0, contentSize.width(), contentSize.height())];
    6362    [m_videoInlineLayer setContentsGravity:kCAGravityResizeAspect];
    6463    if (PAL::isAVFoundationFrameworkAvailable() && [videoLayer isKindOfClass:PAL::getAVPlayerLayerClass()])
    … …  
    7271#endif
    7372    {
     73        [m_videoLayer setFrame:m_videoInlineLayer.get().bounds];
    7474        [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
    75         [m_videoLayer setFrame:m_videoInlineLayer.get().bounds];
    76     }
     75    }
     76}
     77
     78void VideoLayerManagerObjC::didDestroyVideoLayer()
     79{
     80    ALWAYS_LOG(LOGIDENTIFIER);
     81
     82    [m_videoLayer removeFromSuperlayer];
     83
     84    m_videoInlineLayer = nil;
     85    m_videoLayer = nil;
    7786}
    7887
    … …  
    106115
    107116        if (m_videoFullscreenLayer) {
     117            [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
    108118            [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
    109             [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
    110119        } else if (m_videoInlineLayer) {
    111120            [m_videoLayer setFrame:[m_videoInlineLayer bounds]];
    … …  
    146155#endif
    147156
    148 void VideoLayerManagerObjC::didDestroyVideoLayer()
    149 {
    150     ALWAYS_LOG(LOGIDENTIFIER);
    151 
    152     [m_videoLayer removeFromSuperlayer];
    153 
    154     m_videoInlineLayer = nil;
    155     m_videoLayer = nil;
    156 }
    157 
    158157bool VideoLayerManagerObjC::requiresTextTrackRepresentation() const
    159158{
Note: See TracChangeset for help on using the changeset viewer.