WebKit Bugzilla
Attachment 339201 Details for
Bug 185136
: [MediaStream] remove WK1 support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-185136-20180501092052.patch (text/plain), 23.99 KB, created by
Eric Carlson
on 2018-05-01 09:20:53 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Eric Carlson
Created:
2018-05-01 09:20:53 PDT
Size:
23.99 KB
patch
obsolete
>Subversion Revision: 231170 >diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog >index f5f4d56025ff65ad35eed3959d9cc97d6940f8ee..bfb41866fe49bc46d1684e5277e1d575a4a2b067 100644 >--- a/Source/WebKitLegacy/ChangeLog >+++ b/Source/WebKitLegacy/ChangeLog >@@ -1,3 +1,12 @@ >+2018-04-30 Eric Carlson <eric.carlson@apple.com> >+ >+ [MediaStream] remove WK1 support >+ https://bugs.webkit.org/show_bug.cgi?id=185136 >+ >+ Reviewed by Youenn Fablet. >+ >+ * WebKitLegacy.xcodeproj/project.pbxproj: >+ > 2018-04-30 JF Bastien <jfbastien@apple.com> > > Use some C++17 features >diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog >index 252eb10d809c1206303b1107cfb5ee633c0ed957..305f0a515bc47fe5cffad33d6fd56c051442c3ce 100644 >--- a/Source/WebKitLegacy/mac/ChangeLog >+++ b/Source/WebKitLegacy/mac/ChangeLog >@@ -1,3 +1,20 @@ >+2018-04-30 Eric Carlson <eric.carlson@apple.com> >+ >+ [MediaStream] remove WK1 support >+ https://bugs.webkit.org/show_bug.cgi?id=185136 >+ >+ Reviewed by Youenn Fablet. >+ >+ * WebCoreSupport/WebUserMediaClient.h: Removed. >+ * WebCoreSupport/WebUserMediaClient.mm: Removed. >+ * WebView/WebView.mm: >+ (-[WebView _commonInitializationWithFrameName:groupName:]): >+ (-[WebView _preferencesChanged:]): >+ (-[WebView _setUserMediaClient:]): Deleted. >+ (-[WebView _userMediaClient]): Deleted. >+ * WebView/WebViewData.h: >+ * WebView/WebViewPrivate.h: >+ > 2018-04-30 JF Bastien <jfbastien@apple.com> > > Use some C++17 features >diff --git a/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj b/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj >index cb91cc3d362183f77bdb3bef93003b29def0c3c9..0aefd1b2c2deff15b4e29dcd452274359b668918 100644 >--- a/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj >+++ b/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj >@@ -11,8 +11,6 @@ > 065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */; }; > 06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 06693DDA0BFBA85200216072 /* WebInspectorClient.h */; }; > 06693DDD0BFBA85200216072 /* WebInspectorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06693DDB0BFBA85200216072 /* WebInspectorClient.mm */; }; >- 070F549B17F1E42B00169E04 /* WebUserMediaClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F549917F1E42B00169E04 /* WebUserMediaClient.h */; }; >- 070F549C17F1E42B00169E04 /* WebUserMediaClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070F549A17F1E42B00169E04 /* WebUserMediaClient.mm */; }; > 072E5F451ABF88750003B164 /* WebMediaPlaybackTargetPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 072E5F431ABF88750003B164 /* WebMediaPlaybackTargetPicker.h */; }; > 072E5F461ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 072E5F441ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm */; }; > 1430C12C1B2C5DF700DEA01D /* WebViewGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1430C12A1B2C5DF700DEA01D /* WebViewGroup.cpp */; }; >@@ -806,8 +804,6 @@ > 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = "<group>"; }; > 06693DDA0BFBA85200216072 /* WebInspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspectorClient.h; sourceTree = "<group>"; }; > 06693DDB0BFBA85200216072 /* WebInspectorClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorClient.mm; sourceTree = "<group>"; }; >- 070F549917F1E42B00169E04 /* WebUserMediaClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserMediaClient.h; sourceTree = "<group>"; }; >- 070F549A17F1E42B00169E04 /* WebUserMediaClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebUserMediaClient.mm; sourceTree = "<group>"; }; > 072E5F431ABF88750003B164 /* WebMediaPlaybackTargetPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaPlaybackTargetPicker.h; sourceTree = "<group>"; }; > 072E5F441ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMediaPlaybackTargetPicker.mm; sourceTree = "<group>"; }; > 1430C12A1B2C5DF700DEA01D /* WebViewGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = WebViewGroup.cpp; path = WebCoreSupport/WebViewGroup.cpp; sourceTree = SOURCE_ROOT; }; >@@ -2618,8 +2614,6 @@ > A5DEFC0911D5331C00885273 /* WebSecurityOriginPrivate.h */, > 2DD632C019E5D1F0002E9C7B /* WebSelectionServiceController.h */, > 2DD632C119E5D1F0002E9C7B /* WebSelectionServiceController.mm */, >- 070F549917F1E42B00169E04 /* WebUserMediaClient.h */, >- 070F549A17F1E42B00169E04 /* WebUserMediaClient.mm */, > 4618DFF61DEF760A0033C3AA /* WebValidationMessageClient.h */, > 4618DFF71DEF760A0033C3AA /* WebValidationMessageClient.mm */, > 1430C12A1B2C5DF700DEA01D /* WebViewGroup.cpp */, >@@ -3175,7 +3169,6 @@ > A10C1D3D18202FC50036883A /* WebUIKitSupport.h in Headers */, > 939810150824BF01008DF038 /* WebURLsWithTitles.h in Headers */, > C0C5B3EE1177A4A0002B0AEF /* WebUserContentURLPattern.h in Headers */, >- 070F549B17F1E42B00169E04 /* WebUserMediaClient.h in Headers */, > 4618DFF81DEF760A0033C3AA /* WebValidationMessageClient.h in Headers */, > 939810700824BF01008DF038 /* WebView.h in Headers */, > BC2E464D0FD8A96800A9D9DE /* WebViewData.h in Headers */, >@@ -3689,7 +3682,6 @@ > A10C1D3E18202FC50036883A /* WebUIKitSupport.mm in Sources */, > 939810BE0824BF01008DF038 /* WebURLsWithTitles.m in Sources */, > C0C5B3EF1177A4A0002B0AEF /* WebUserContentURLPattern.mm in Sources */, >- 070F549C17F1E42B00169E04 /* WebUserMediaClient.mm in Sources */, > 4618DFF91DEF760A0033C3AA /* WebValidationMessageClient.mm in Sources */, > C1D81128202CD80000EE74F9 /* WebVideoFullscreenController.mm in Sources */, > C1D8112B202CDCC400EE74F9 /* WebVideoFullscreenHUDWindowController.mm in Sources */, >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.h b/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.h >deleted file mode 100644 >index 283cc3786b54ca6b3e04bd924c9f2a5adcecf94a..0000000000000000000000000000000000000000 >--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.h >+++ /dev/null >@@ -1,54 +0,0 @@ >-/* >- * Copyright (C) 2013-2016 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. >- */ >- >-#ifndef WebUserMediaClient_h >-#define WebUserMediaClient_h >- >-#if ENABLE(MEDIA_STREAM) >- >-#import <WebCore/UserMediaClient.h> >- >-@class WebView; >- >-class WebUserMediaClient final : public WebCore::UserMediaClient { >-public: >- WebUserMediaClient(WebView*); >- ~WebUserMediaClient(); >- >- // UserMediaClient >- void requestUserMediaAccess(WebCore::UserMediaRequest&) final; >- void cancelUserMediaAccessRequest(WebCore::UserMediaRequest&) final; >- >- void enumerateMediaDevices(WebCore::MediaDevicesEnumerationRequest&) final; >- void cancelMediaDevicesEnumerationRequest(WebCore::MediaDevicesEnumerationRequest&) final; >- >- void pageDestroyed() final; >- >-private: >- WebView* m_webView; >-}; >- >-#endif >-#endif >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm >deleted file mode 100644 >index 0c27fb02b16f0f27d4e18de12970118a71bce5f1..0000000000000000000000000000000000000000 >--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebUserMediaClient.mm >+++ /dev/null >@@ -1,321 +0,0 @@ >-/* >- * Copyright (C) 2013-2016 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. >- */ >- >-#import "WebUserMediaClient.h" >- >-#if ENABLE(MEDIA_STREAM) >- >-#import "WebDelegateImplementationCaching.h" >-#import "WebSecurityOriginInternal.h" >-#import "WebUIDelegatePrivate.h" >-#import "WebViewInternal.h" >-#import <WebCore/CaptureDevice.h> >-#import <WebCore/MediaDevicesEnumerationRequest.h> >-#import <WebCore/RealtimeMediaSourceCenter.h> >-#import <WebCore/ScriptExecutionContext.h> >-#import <WebCore/UserMediaRequest.h> >-#import <wtf/BlockObjCExceptions.h> >-#import <wtf/HashMap.h> >-#import <wtf/NeverDestroyed.h> >-#import <wtf/RefPtr.h> >-#import <wtf/RetainPtr.h> >- >-using namespace WebCore; >- >-@interface WebUserMediaPolicyListener : NSObject <WebAllowDenyPolicyListener> >-{ >- RefPtr<UserMediaRequest> _request; >-} >-- (id)initWithUserMediaRequest:(Ref<UserMediaRequest>&&)request; >-- (void)cancelUserMediaAccessRequest; >-- (void)deny; >-@end >- >-@interface WebUserMediaPolicyCheckerListener : NSObject <WebAllowDenyPolicyListener> { >- RefPtr<MediaDevicesEnumerationRequest> _request; >-} >-- (id)initWithMediaDevicesEnumerationRequest:(Ref<MediaDevicesEnumerationRequest>&&)request; >-- (void)cancelMediaDevicesEnumerationRequest; >-- (void)deny; >-@end >- >-typedef HashMap<RefPtr<UserMediaRequest>, RetainPtr<WebUserMediaPolicyListener>> UserMediaRequestsMap; >- >-static UserMediaRequestsMap& userMediaRequestsMap() >-{ >- static NeverDestroyed<UserMediaRequestsMap> requests; >- return requests; >-} >- >-static void AddRequestToRequestMap(UserMediaRequest* request, RetainPtr<WebUserMediaPolicyListener> listener) >-{ >- userMediaRequestsMap().set(request, listener); >-} >- >-static void RemoveRequestFromRequestMap(UserMediaRequest* request) >-{ >- userMediaRequestsMap().remove(request); >-} >- >-typedef HashMap<RefPtr<MediaDevicesEnumerationRequest>, RetainPtr<WebUserMediaPolicyCheckerListener>> UserMediaCheckMap; >- >-static UserMediaCheckMap& userMediaCheckMap() >-{ >- static NeverDestroyed<UserMediaCheckMap> requests; >- return requests; >-} >- >-static void AddPermissionCheckToMap(MediaDevicesEnumerationRequest* request, RetainPtr<WebUserMediaPolicyCheckerListener> listener) >-{ >- userMediaCheckMap().set(request, listener); >-} >- >-static void RemovePermissionCheckFromMap(MediaDevicesEnumerationRequest* request) >-{ >- userMediaCheckMap().remove(request); >-} >- >-WebUserMediaClient::WebUserMediaClient(WebView* webView) >- : m_webView(webView) >-{ >-} >- >-WebUserMediaClient::~WebUserMediaClient() >-{ >-} >- >-void WebUserMediaClient::pageDestroyed() >-{ >- auto& requestsMap = userMediaRequestsMap(); >- auto pendingRequests = copyToVector(requestsMap.values()); >- requestsMap.clear(); >- >- for (auto& request : pendingRequests) >- [request cancelUserMediaAccessRequest]; >- >- ASSERT(userMediaRequestsMap().isEmpty()); >- >- auto& checkMap = userMediaCheckMap(); >- auto pendingChecks = copyToVector(checkMap.values()); >- checkMap.clear(); >- >- for (auto& check : pendingChecks) >- [check cancelMediaDevicesEnumerationRequest]; >- >- ASSERT(userMediaCheckMap().isEmpty()); >- >- delete this; >-} >- >-void WebUserMediaClient::requestUserMediaAccess(UserMediaRequest& request) >-{ >- BEGIN_BLOCK_OBJC_EXCEPTIONS; >- >- SEL selector = @selector(webView:decidePolicyForUserMediaRequestFromOrigin:listener:); >- if (![[m_webView UIDelegate] respondsToSelector:selector]) { >- request.deny(UserMediaRequest::MediaAccessDenialReason::UserMediaDisabled, ""); >- return; >- } >- >- WebUserMediaPolicyListener *listener = [[WebUserMediaPolicyListener alloc] initWithUserMediaRequest:request]; >- WebSecurityOrigin *webOrigin = [[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:request.userMediaDocumentOrigin()]; >- >- AddRequestToRequestMap(&request, listener); >- CallUIDelegate(m_webView, selector, webOrigin, listener); >- >- [webOrigin release]; >- [listener release]; >- >- END_BLOCK_OBJC_EXCEPTIONS; >-} >- >-void WebUserMediaClient::cancelUserMediaAccessRequest(UserMediaRequest& request) >-{ >- UserMediaRequestsMap& requestsMap = userMediaRequestsMap(); >- UserMediaRequestsMap::iterator it = requestsMap.find(&request); >- if (it == requestsMap.end()) >- return; >- >- [it->value cancelUserMediaAccessRequest]; >- requestsMap.remove(it); >-} >- >-void WebUserMediaClient::enumerateMediaDevices(MediaDevicesEnumerationRequest& request) >-{ >- BEGIN_BLOCK_OBJC_EXCEPTIONS; >- >- SEL selector = @selector(webView:checkPolicyForUserMediaRequestFromOrigin:listener:); >- if (![[m_webView UIDelegate] respondsToSelector:selector]) { >- request.setDeviceInfo(Vector<CaptureDevice>(), emptyString(), false); >- return; >- } >- >- WebUserMediaPolicyCheckerListener *listener = [[WebUserMediaPolicyCheckerListener alloc] initWithMediaDevicesEnumerationRequest:request]; >- WebSecurityOrigin *webOrigin = [[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:request.userMediaDocumentOrigin()]; >- >- AddPermissionCheckToMap(&request, listener); >- CallUIDelegate(m_webView, selector, webOrigin, listener); >- >- [webOrigin release]; >- [listener release]; >- >- END_BLOCK_OBJC_EXCEPTIONS; >-} >- >-void WebUserMediaClient::cancelMediaDevicesEnumerationRequest(WebCore::MediaDevicesEnumerationRequest& request) >-{ >- UserMediaCheckMap& requestsMap = userMediaCheckMap(); >- UserMediaCheckMap::iterator it = requestsMap.find(&request); >- if (it == requestsMap.end()) >- return; >- >- [it->value cancelMediaDevicesEnumerationRequest]; >- requestsMap.remove(it); >-} >- >-@implementation WebUserMediaPolicyListener >- >-- (id)initWithUserMediaRequest:(Ref<UserMediaRequest>&&)request >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!(self = [super init])) >- return nil; >- >- _request = WTFMove(request); >- return self; >-#endif >-} >- >-- (void)cancelUserMediaAccessRequest >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!_request) >- return; >- >- _request = nullptr; >-#endif >- >-} >- >-- (void)allow >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!_request) >- return; >- >- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=162154 >- RemoveRequestFromRequestMap(_request.get()); >-#endif >-} >- >-- (void)deny >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!_request) >- return; >- >- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=162154 >- RemoveRequestFromRequestMap(_request.get()); >-#endif >-} >- >-#if PLATFORM(IOS) >-- (void)denyOnlyThisRequest >-{ >-} >- >-- (BOOL)shouldClearCache >-{ >- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=146245 >- ASSERT_NOT_REACHED(); >- return true; >-} >-#endif >- >-@end >- >- >-@implementation WebUserMediaPolicyCheckerListener >- >-- (id)initWithMediaDevicesEnumerationRequest:(Ref<MediaDevicesEnumerationRequest>&&)request >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!(self = [super init])) >- return nil; >- >- _request = WTFMove(request); >- return self; >-#endif >-} >- >-- (void)cancelMediaDevicesEnumerationRequest >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!_request) >- return; >- >- _request = nullptr; >-#endif >- >-} >- >-- (void)allow >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!_request) >- return; >- >- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=162154 >- RemovePermissionCheckFromMap(_request.get()); >-#endif >-} >- >-- (void)deny >-{ >-#if ENABLE(MEDIA_STREAM) >- if (!_request) >- return; >- >- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=162154 >- RemovePermissionCheckFromMap(_request.get()); >-#endif >-} >- >-#if PLATFORM(IOS) >-- (void)denyOnlyThisRequest >-{ >-} >- >-- (BOOL)shouldClearCache >-{ >- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=146245 >- ASSERT_NOT_REACHED(); >- return true; >-} >-#endif >- >-@end >- >-#endif // ENABLE(MEDIA_STREAM) >diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm >index b1d83c505cc9a53808a4a6bca87bcc6ba5fd034f..fefadfc81a6c1e31ff9fcdb51164492145f5b3b9 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebView.mm >+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm >@@ -110,7 +110,6 @@ > #import "WebTextIterator.h" > #import "WebUIDelegate.h" > #import "WebUIDelegatePrivate.h" >-#import "WebUserMediaClient.h" > #import "WebValidationMessageClient.h" > #import "WebViewGroup.h" > #import "WebVisitedLinkStore.h" >@@ -1472,9 +1471,6 @@ static void WebKitInitializeGamepadProviderIfNecessary() > WebCore::provideDeviceOrientationTo(_private->page, new WebDeviceOrientationClient(self)); > #endif > #endif >-#if ENABLE(MEDIA_STREAM) >- WebCore::provideUserMediaTo(_private->page, new WebUserMediaClient(self)); >-#endif > > #if ENABLE(REMOTE_INSPECTOR) > _private->page->setRemoteInspectionAllowed(true); >@@ -3038,10 +3034,10 @@ static bool needsSelfRetainWhileLoadingQuirk() > #endif > > #if ENABLE(MEDIA_STREAM) >- DeprecatedGlobalSettings::setMockCaptureDevicesEnabled([preferences mockCaptureDevicesEnabled]); >- DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection([preferences mediaCaptureRequiresSecureConnection]); >- RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled([preferences mediaStreamEnabled]); >- RuntimeEnabledFeatures::sharedFeatures().setMediaDevicesEnabled([preferences mediaDevicesEnabled]); >+ DeprecatedGlobalSettings::setMockCaptureDevicesEnabled(false); >+ DeprecatedGlobalSettings::setMediaCaptureRequiresSecureConnection(true); >+ RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(false); >+ RuntimeEnabledFeatures::sharedFeatures().setMediaDevicesEnabled(false); > #endif > > #if ENABLE(WEB_RTC) >@@ -10079,24 +10075,6 @@ static NSTextAlignment nsTextAlignmentFromRenderStyle(const RenderStyle* style) > > @end > >-#if ENABLE(MEDIA_STREAM) >-@implementation WebView (WebViewUserMedia) >- >-- (void)_setUserMediaClient:(id<WebUserMediaClient>)userMediaClient >-{ >- if (_private) >- _private->m_userMediaClient = userMediaClient; >-} >- >-- (id<WebUserMediaClient>)_userMediaClient >-{ >- if (_private) >- return _private->m_userMediaClient; >- return nil; >-} >-@end >-#endif >- > @implementation WebView (WebViewGeolocation) > > - (void)_setGeolocationProvider:(id<WebGeolocationProvider>)geolocationProvider >diff --git a/Source/WebKitLegacy/mac/WebView/WebViewData.h b/Source/WebKitLegacy/mac/WebView/WebViewData.h >index 5a73f1ac6ab2a9926519c72befc2e6daba93c749..3f36ad37e7ec47634b0a9182871e4fca4522697f 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebViewData.h >+++ b/Source/WebKitLegacy/mac/WebView/WebViewData.h >@@ -77,9 +77,6 @@ class PlaybackSessionModelMediaElement; > #if ENABLE(FULLSCREEN_API) > @class WebFullScreenController; > #endif >-#if ENABLE(MEDIA_STREAM) >-@protocol WebUserMediaClient; >-#endif > #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(IOS) > @class WebIndicateLayer; > #endif >@@ -356,10 +353,6 @@ private: > id<WebDeviceOrientationProvider> m_deviceOrientationProvider; > id<WebNotificationProvider> _notificationProvider; > >-#if ENABLE(MEDIA_STREAM) >- id<WebUserMediaClient> m_userMediaClient; >-#endif >- > #if ENABLE(SERVICE_CONTROLS) > std::unique_ptr<WebSelectionServiceController> _selectionServiceController; > #endif >diff --git a/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h b/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h >index 860883bea1c2fba802eb12a0ee154d54c52d63a1..f9bac557e2b8f7f5ee423171a6143299d9b7b752 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h >+++ b/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h >@@ -75,7 +75,6 @@ > #endif > @protocol WebDeviceOrientationProvider; > @protocol WebFormDelegate; >-@protocol WebUserMediaClient; > > #if !TARGET_OS_IPHONE > extern NSString *_WebCanGoBackKey; >@@ -1009,11 +1008,6 @@ typedef struct WebEdgeInsets { > > #endif > >-@interface WebView (WebViewUserMedia) >-- (void)_setUserMediaClient:(id<WebUserMediaClient>)userMediaClient; >-- (id<WebUserMediaClient>)_userMediaClient; >-@end >- > @protocol WebGeolocationProvider <NSObject> > - (void)registerWebView:(WebView *)webView; > - (void)unregisterWebView:(WebView *)webView; >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index faed572a3ec7b268b304dfb056cefc755852a0f4..8ccf7a991180cd95ca9ab02a56f6032d49994bc0 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,13 @@ >+2018-04-30 Eric Carlson <eric.carlson@apple.com> >+ >+ [MediaStream] remove WK1 support >+ https://bugs.webkit.org/show_bug.cgi?id=185136 >+ >+ Reviewed by Youenn Fablet. >+ >+ * DumpRenderTree/mac/UIDelegate.mm: >+ (-[UIDelegate webView:decidePolicyForUserMediaRequestFromOrigin:listener:]): Deleted. >+ > 2018-04-30 JF Bastien <jfbastien@apple.com> > > Use some C++17 features >diff --git a/Tools/DumpRenderTree/mac/UIDelegate.mm b/Tools/DumpRenderTree/mac/UIDelegate.mm >index 386a1746257aa1edd6ddbab70b12208e3f82439e..9620d12054e4aeeef35fca331eada959598d9ca6 100644 >--- a/Tools/DumpRenderTree/mac/UIDelegate.mm >+++ b/Tools/DumpRenderTree/mac/UIDelegate.mm >@@ -356,12 +356,6 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil; > } > } > >-- (void)webView:(WebView *)webView decidePolicyForUserMediaRequestFromOrigin:(WebSecurityOrigin *)origin listener:(id<WebAllowDenyPolicyListener>)listener >-{ >- // Allow all user media requests for now. >- [listener allow]; >-} >- > - (NSData *)webCryptoMasterKeyForWebView:(WebView *)sender > { > // Any 128 bit key would do, all we need for testing is to implement the callback. >diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations >index d70642e721063d4d27cee321c3b2a5455c6444eb..d69d5e5cbd1a8bd192b2d6530bf062416f179beb 100644 >--- a/LayoutTests/platform/mac-wk1/TestExpectations >+++ b/LayoutTests/platform/mac-wk1/TestExpectations >@@ -135,6 +135,7 @@ fast/mediastream > imported/w3c/web-platform-tests/mediacapture-streams > http/tests/media/media-stream > http/tests/ssl/media-stream >+fast/events/constructors/media-stream-event-constructor.html > > # WK1 does not filter response headers. > http/wpt/loading/redirect-headers.html [ Skip ]
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=339201">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185136
:
339120
|
339126
|
339148
|
339157
|
339161
| 339201