Diff
Modified: trunk/Source/WebCore/ChangeLog (256720 => 256721)
--- trunk/Source/WebCore/ChangeLog 2020-02-17 02:49:45 UTC (rev 256720)
+++ trunk/Source/WebCore/ChangeLog 2020-02-17 04:31:24 UTC (rev 256721)
@@ -1,3 +1,18 @@
+2020-02-16 Peng Liu <[email protected]>
+
+ Remove class VideoLayerManager since it is not used
+ https://bugs.webkit.org/show_bug.cgi?id=207800
+
+ Reviewed by Eric Carlson.
+
+ No behavior change.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/VideoLayerManager.h: Removed.
+ * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h:
+ * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm:
+ (WebCore::VideoLayerManagerObjC::VideoLayerManagerObjC):
+
2020-02-16 Fujii Hironori <[email protected]>
Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (256720 => 256721)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-02-17 02:49:45 UTC (rev 256720)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-02-17 04:31:24 UTC (rev 256721)
@@ -6511,7 +6511,6 @@
1D2C82B6236A3F6A0055D6C5 /* PictureInPictureSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PictureInPictureSupport.h; sourceTree = "<group>"; };
1D392F2823F209B400E04B2D /* VideoLayerManagerObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoLayerManagerObjC.mm; sourceTree = "<group>"; };
1D392F2A23F209B500E04B2D /* VideoLayerManagerObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoLayerManagerObjC.h; sourceTree = "<group>"; };
- 1D392F2B23F209D800E04B2D /* VideoLayerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoLayerManager.h; sourceTree = "<group>"; };
1DBC1B552347B3D200B901AF /* PictureInPictureObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PictureInPictureObserver.h; sourceTree = "<group>"; };
1DC553FD211BA12A004B780E /* NavigatorShare.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorShare.idl; sourceTree = "<group>"; };
1DC553FF211BA841004B780E /* ShareData.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShareData.idl; sourceTree = "<group>"; };
@@ -25120,7 +25119,6 @@
E4AFCFA40DAF29A300F5F55C /* UnitBezier.h */,
0F5A57CA229B18AE0025EDA9 /* VelocityData.cpp */,
0F1A0C36229A481800D37ADB /* VelocityData.h */,
- 1D392F2B23F209D800E04B2D /* VideoLayerManager.h */,
BEF29EEA1715DD0900C4B4C9 /* VideoTrackPrivate.h */,
1411DCB0164C39A800D49BC1 /* WidthCache.h */,
939B02EC0EA2DBC400C54570 /* WidthIterator.cpp */,
Deleted: trunk/Source/WebCore/platform/graphics/VideoLayerManager.h (256720 => 256721)
--- trunk/Source/WebCore/platform/graphics/VideoLayerManager.h 2020-02-17 02:49:45 UTC (rev 256720)
+++ trunk/Source/WebCore/platform/graphics/VideoLayerManager.h 2020-02-17 04:31:24 UTC (rev 256721)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "NativeImage.h"
-#include "PlatformLayer.h"
-#include <wtf/Function.h>
-#include <wtf/Noncopyable.h>
-
-namespace WebCore {
-
-class FloatRect;
-class IntSize;
-class TextTrackRepresentation;
-
-class VideoLayerManager {
- WTF_MAKE_NONCOPYABLE(VideoLayerManager);
-public:
- VideoLayerManager() = default;
- virtual ~VideoLayerManager() { }
-
- virtual PlatformLayer *videoInlineLayer() const = 0;
- virtual PlatformLayer *videoFullscreenLayer() const = 0;
- virtual FloatRect videoFullscreenFrame() const = 0;
-
- virtual void setVideoLayer(PlatformLayer*, IntSize) = 0;
- virtual void didDestroyVideoLayer() = 0;
-
- virtual void setVideoFullscreenLayer(PlatformLayer*, WTF::Function<void()>&& completionHandler, NativeImagePtr) = 0;
- virtual void updateVideoFullscreenInlineImage(NativeImagePtr) = 0;
- virtual void setVideoFullscreenFrame(FloatRect) = 0;
-
- virtual bool requiresTextTrackRepresentation() const = 0;
- virtual void setTextTrackRepresentation(TextTrackRepresentation*) = 0;
- virtual void syncTextTrackBounds() = 0;
-};
-
-}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h (256720 => 256721)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h 2020-02-17 02:49:45 UTC (rev 256720)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h 2020-02-17 04:31:24 UTC (rev 256721)
@@ -27,8 +27,8 @@
#include "FloatRect.h"
#include "IntSize.h"
+#include "NativeImage.h"
#include "PlatformLayer.h"
-#include "VideoLayerManager.h"
#include "WebVideoContainerLayer.h"
#include <wtf/Function.h>
#include <wtf/LoggerHelper.h>
@@ -35,28 +35,29 @@
#include <wtf/Noncopyable.h>
#include <wtf/RetainPtr.h>
-OBJC_CLASS AVPlayerLayer;
-
namespace WebCore {
-class VideoLayerManagerObjC final : public VideoLayerManager , public LoggerHelper {
+class TextTrackRepresentation;
+
+class VideoLayerManagerObjC final : public LoggerHelper {
+ WTF_MAKE_NONCOPYABLE(VideoLayerManagerObjC);
WTF_MAKE_FAST_ALLOCATED;
public:
VideoLayerManagerObjC(const Logger&, const void*);
- PlatformLayer *videoInlineLayer() const final { return m_videoInlineLayer.get(); }
- PlatformLayer *videoFullscreenLayer() const final { return m_videoFullscreenLayer.get(); }
- FloatRect videoFullscreenFrame() const final { return m_videoFullscreenFrame; }
+ PlatformLayer *videoInlineLayer() const { return m_videoInlineLayer.get(); }
+ PlatformLayer *videoFullscreenLayer() const { return m_videoFullscreenLayer.get(); }
+ FloatRect videoFullscreenFrame() const { return m_videoFullscreenFrame; }
- void setVideoLayer(PlatformLayer *, IntSize contentSize) final;
- void setVideoFullscreenLayer(PlatformLayer *, WTF::Function<void()>&& completionHandler, NativeImagePtr) final;
- void updateVideoFullscreenInlineImage(NativeImagePtr) final;
- void setVideoFullscreenFrame(FloatRect) final;
- void didDestroyVideoLayer() final;
+ void setVideoLayer(PlatformLayer *, IntSize contentSize);
+ void setVideoFullscreenLayer(PlatformLayer *, WTF::Function<void()>&& completionHandler, NativeImagePtr);
+ void updateVideoFullscreenInlineImage(NativeImagePtr);
+ void setVideoFullscreenFrame(FloatRect);
+ void didDestroyVideoLayer();
- bool requiresTextTrackRepresentation() const final;
- void setTextTrackRepresentation(TextTrackRepresentation*) final;
- void syncTextTrackBounds() final;
+ bool requiresTextTrackRepresentation() const;
+ void setTextTrackRepresentation(TextTrackRepresentation*);
+ void syncTextTrackBounds();
private:
const Logger& logger() const final { return m_logger.get(); }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm (256720 => 256721)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm 2020-02-17 02:49:45 UTC (rev 256720)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm 2020-02-17 04:31:24 UTC (rev 256721)
@@ -34,15 +34,17 @@
#import <mach/mach_port.h>
#import <pal/spi/cocoa/QuartzCoreSPI.h>
#import <wtf/BlockPtr.h>
+#import <wtf/Logger.h>
#import <wtf/MachSendRight.h>
#include <pal/cocoa/AVFoundationSoftLink.h>
+OBJC_CLASS AVPlayerLayer;
+
namespace WebCore {
VideoLayerManagerObjC::VideoLayerManagerObjC(const Logger& logger, const void* logIdentifier)
- : VideoLayerManager()
- , m_logger(logger)
+ : m_logger(logger)
, m_logIdentifier(logIdentifier)
{
}
