Attachment 387504 Details for Bug 206060 – Patch for landing

[patch] Patch for landing

bug-206060-20200113085454.patch (text/plain), 3.47 KB, created by youenn fablet on 2020-01-12 23:54:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2020-01-12 23:54:56 PST

Size: 3.47 KB

patch

obsolete

>Subversion Revision: 254422
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0da65c6691f4fd0d038a436305773129ed7f4ae4..1c98646293f04be24bacb6bbaa6fd1cf8da66a7d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2020-01-12  youenn fablet  <youenn@apple.com>
>+
>+        Clean-up MediaPlayerPrivateMediaStreamAVFObjC.h/.mm
>+        https://bugs.webkit.org/show_bug.cgi?id=206060
>+
>+        Reviewed by Eric Carlson.
>+
>+        No change of behavior.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
>+
> 2020-01-12  Zalan Bujtas  <zalan@apple.com>
> 
>         Text-indent with percentage value should resolve against the available width
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h
>index bc5f391b6520b031b6e6c8555da9c3e220394091..c1bb80fef1db03826fa3e513471690a87a5f7001 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
>+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -23,26 +23,19 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef MediaPlayerPrivateMediaStreamAVFObjC_h
>-#define MediaPlayerPrivateMediaStreamAVFObjC_h
>+#pragma once
> 
> #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
> 
> #include "MediaPlayerPrivate.h"
> #include "MediaSample.h"
> #include "MediaStreamPrivate.h"
>-#include <CoreGraphics/CGAffineTransform.h>
> #include <wtf/Deque.h>
>-#include <wtf/Function.h>
>+#include <wtf/Forward.h>
> #include <wtf/LoggerHelper.h>
>-#include <wtf/MediaTime.h>
> #include <wtf/WeakPtr.h>
> 
>-OBJC_CLASS AVSampleBufferAudioRenderer;
> OBJC_CLASS AVSampleBufferDisplayLayer;
>-OBJC_CLASS AVSampleBufferRenderSynchronizer;
>-OBJC_CLASS AVStreamSession;
>-OBJC_CLASS NSNumber;
> OBJC_CLASS WebAVSampleBufferStatusChangeListener;
> 
> namespace PAL {
>@@ -283,5 +276,3 @@ private:
> }
> 
> #endif // ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
>-
>-#endif // MediaPlayerPrivateMediaStreamAVFObjC_h
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
>index 6c5f50b4da00d2102bade3794f9ddd0bd4192663..8d23c93e2ee9521f874521fcf0f4d586f0b8fb2a 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
>@@ -36,12 +36,14 @@
> #import "VideoFullscreenLayerManagerObjC.h"
> #import "VideoTrackPrivateMediaStream.h"
> #import <AVFoundation/AVSampleBufferDisplayLayer.h>
>+#import <CoreGraphics/CGAffineTransform.h>
> #import <QuartzCore/CALayer.h>
> #import <QuartzCore/CATransaction.h>
> #import <objc_runtime.h>
> #import <pal/avfoundation/MediaTimeAVFoundation.h>
> #import <pal/spi/mac/AVFoundationSPI.h>
> #import <pal/system/Clock.h>
>+#import <wtf/Deque.h>
> #import <wtf/Function.h>
> #import <wtf/MainThread.h>
> #import <wtf/NeverDestroyed.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 206060: 387328 | 387504