haikuwebkit/Source/WTF/wtf/Observer.h

61 lines
2.0 KiB
C
Raw Permalink Normal View History

[Cocoa] Adopt -[AVContentKeyRequest willOutputBeObscuredDueToInsufficientExternalProtectionForDisplays:] https://bugs.webkit.org/show_bug.cgi?id=214659 <rdar://problem/63555006> Reviewed by Darin Adler. Source/WebCore: Use the new WTF::Observer object as the listener type for notifying clients of display changes. When a displayChanged event is observed, use the new AVContentKeyRequest -willOutputBeObscuredDueToInsufficientExternalProtectionForDisplays: to set the keyStatus for that request appropriately. * Modules/encryptedmedia/MediaKeySession.cpp: (WebCore::MediaKeySession::MediaKeySession): (WebCore::MediaKeySession::displayID): (WebCore::MediaKeySession::displayChanged): * Modules/encryptedmedia/MediaKeySession.h: * dom/Document.cpp: (WebCore::Document::windowScreenDidChange): (WebCore::Document::addDisplayChangedObserver): * dom/Document.h: * platform/encryptedmedia/CDMInstanceSession.h: (WebCore::CDMInstanceSession::displayChanged): * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h: * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm: (-[WebCoreFPSContentKeySessionDelegate contentKeySession:externalProtectionStatusDidChangeForContentKeyRequest:]): (WebCore::CDMInstanceFairPlayStreamingAVFObjC::externalProtectionStatusDidChangeForContentKeyRequest): (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::displayChanged): (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::externalProtectionStatusDidChangeForContentKeyRequest): (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateProtectionStatusForDisplayID): Source/WebCore/PAL: * pal/spi/cocoa/AVFoundationSPI.h: Source/WebKit: Support clients in the GPU process asking for (and receiving updates to) the current displayID. * GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp: (WebKit::RemoteCDMInstanceSessionProxy::displayIDChanged): * GPUProcess/media/RemoteCDMInstanceSessionProxy.h: * GPUProcess/media/RemoteCDMInstanceSessionProxy.messages.in: Source/WTF: Add a new Observer template class. This allows classes to provide support for listeners without requiring those listeners to subclass from a pure-virtual (and CanMakeWeakPtr capable) client class. Instead, clients can just create one of these Observer objects, and pass a WeakPtr to that observer to the notifying object. When the client object destroys the observer, it is automatically unregistered when the observing object uses a WeakHashSet. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/Observer.h: Added. (WTF::Observer<Out): Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/Observer.cpp: Added. (TestWebKitAPI::TEST): Canonical link: https://commits.webkit.org/227802@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265115 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-07-30 23:08:00 +00:00
/*
* Copyright (C) 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
* 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. AND ITS CONTRIBUTORS ``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 ITS 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 <wtf/Function.h>
#include <wtf/Noncopyable.h>
#include <wtf/WeakPtr.h>
namespace WTF {
template<typename> class Observer;
template <typename Out, typename... In>
class Observer<Out(In...)> : public CanMakeWeakPtr<Observer<Out(In...)>> {
WTF_MAKE_NONCOPYABLE(Observer);
WTF_MAKE_FAST_ALLOCATED;
public:
Observer(Function<Out(In...)>&& callback)
: m_callback(WTFMove(callback))
{
ASSERT(m_callback);
}
Out operator()(In... in) const
{
ASSERT(m_callback);
return m_callback(std::forward<In>(in)...);
}
private:
Function<Out(In...)> m_callback;
};
}
using WTF::Observer;