WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-167305-20170123081300.patch (text/plain), 7.68 KB, created by
youenn fablet
on 2017-01-23 08:14:58 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
youenn fablet
Created:
2017-01-23 08:14:58 PST
Size:
7.68 KB
patch
obsolete
>Subversion Revision: 210988 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index f7ae456e2d6c9fab26c854ae8a3f21c6eb4fb9c5..1b240b857a111863dfcb383f6ca4a43c538d4896 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,12 @@ >+2017-01-23 Youenn Fablet <youennf@gmail.com> >+ >+ [WebRTC] Add support for WK1 libwebrtc endpoint >+ https://bugs.webkit.org/show_bug.cgi?id=167305 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * WebKit.xcodeproj/project.pbxproj: Adding libwebrtc/Source in include path. >+ > 2017-01-17 Antti Koivisto <antti@apple.com> > > Persist derived data >diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog >index 605986721cdf79da8e6481045ca174c4902cc8ab..d575a419a3c511ba59f1239c14d374d2d01115c3 100644 >--- a/Source/WebKit/mac/ChangeLog >+++ b/Source/WebKit/mac/ChangeLog >@@ -1,3 +1,18 @@ >+2017-01-23 Youenn Fablet <youennf@gmail.com> >+ >+ [WebRTC] Add support for WK1 libwebrtc endpoint >+ https://bugs.webkit.org/show_bug.cgi?id=167305 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Implementing RTCStrategy for WK1. >+ The networking being done in the same process, the regular libwebrtc stack is used. >+ >+ * WebCoreSupport/WebPlatformStrategies.h: >+ * WebCoreSupport/WebPlatformStrategies.mm: >+ (WebPlatformStrategies::WebPlatformStrategies): >+ (WebPlatformStrategies::createPeerConnection): >+ > 2017-01-20 Antoine Quint <graouts@apple.com> > > [Modern Media Controls] Turn modern media controls on by default >diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >index 479fdc97e0c5a6b26845a2f7464ff545a2961980..36b4aa28e4ed9490e0d9436859a8c406621ab29c 100644 >--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj >+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >@@ -3748,6 +3748,15 @@ > baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */; > buildSettings = { > DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH"; >+ HEADER_SEARCH_PATHS = ( >+ "$(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH)", >+ "\"$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders\"", >+ "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy\"", >+ "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"", >+ "$(WEBKITADDITIONS_HEADER_SEARCH_PATHS)", >+ "$(HEADER_SEARCH_PATHS)", >+ "$(SRCROOT)/../ThirdParty/libwebrtc/Source", >+ ); > OTHER_LDFLAGS = ( > "$(OTHER_LDFLAGS)", > "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)", >@@ -3760,6 +3769,15 @@ > baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */; > buildSettings = { > DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH"; >+ HEADER_SEARCH_PATHS = ( >+ "$(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH)", >+ "\"$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders\"", >+ "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy\"", >+ "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"", >+ "$(WEBKITADDITIONS_HEADER_SEARCH_PATHS)", >+ "$(HEADER_SEARCH_PATHS)", >+ "$(SRCROOT)/../ThirdParty/libwebrtc/Source", >+ ); > OTHER_LDFLAGS = ( > "$(OTHER_LDFLAGS)", > "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)", >@@ -3772,6 +3790,15 @@ > baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */; > buildSettings = { > BUILD_VARIANTS = normal; >+ HEADER_SEARCH_PATHS = ( >+ "$(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH)", >+ "\"$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders\"", >+ "\"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy\"", >+ "\"$(BUILT_PRODUCTS_DIR)/usr/local/include\"", >+ "$(WEBKITADDITIONS_HEADER_SEARCH_PATHS)", >+ "$(HEADER_SEARCH_PATHS)", >+ "$(SRCROOT)/../ThirdParty/libwebrtc/libwebrtc", >+ ); > OTHER_LDFLAGS = ( > "$(OTHER_LDFLAGS)", > "-lWebKitSystemInterface", >diff --git a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h b/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h >index c5e41dde89b393134a7a2c9b2add2c8f79503356..4d2f13a36f80f5cbb2ab6a75dbbb46a392fa4023 100644 >--- a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h >+++ b/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h >@@ -30,22 +30,28 @@ > #include <WebCore/LoaderStrategy.h> > #include <WebCore/PasteboardStrategy.h> > #include <WebCore/PlatformStrategies.h> >+#include <WebCore/RTCStrategy.h> > > struct PasteboardImage; > struct PasteboardWebContent; > >-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy { >+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy >+#if ENABLE(LIBWEBRTC_ENDPOINT) >+ , private WebCore::RTCStrategy >+#endif >+ { > public: > static void initializeIfNecessary(); >- >+ > private: > WebPlatformStrategies(); >- >+ > // WebCore::PlatformStrategies > WebCore::CookiesStrategy* createCookiesStrategy() override; > WebCore::LoaderStrategy* createLoaderStrategy() override; > WebCore::PasteboardStrategy* createPasteboardStrategy() override; > WebCore::BlobRegistry* createBlobRegistry() override; >+ WebCore::RTCStrategy& createRTCStrategy() final { return *this; } > > // WebCore::CookiesStrategy > String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override; >@@ -83,6 +89,10 @@ private: > long setBufferForType(WebCore::SharedBuffer*, const String& pasteboardType, const String& pasteboardName) override; > long setPathnamesForType(const Vector<String>&, const String& pasteboardType, const String& pasteboardName) override; > long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override; >+ >+#if ENABLE(LIBWEBRTC_ENDPOINT) >+ rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver&) final; >+#endif > }; > > #endif // WebPlatformStrategies_h >diff --git a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm b/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm >index 435ec8794601c7497ba64e6ec35a2d2ad0cbd6a5..f30ad038c55627df0e7116d2ae289cccf3ec291b 100644 >--- a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm >+++ b/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm >@@ -30,6 +30,7 @@ > #import "WebResourceLoadScheduler.h" > #import <WebCore/BlobRegistryImpl.h> > #import <WebCore/Color.h> >+#import <WebCore/LibWebRTCUtils.h> > #import <WebCore/MainFrame.h> > #import <WebCore/NetworkStorageSession.h> > #import <WebCore/PlatformCookieJar.h> >@@ -37,6 +38,7 @@ > #import <WebCore/SharedBuffer.h> > #import <WebCore/SubframeLoader.h> > #import <WebKitSystemInterface.h> >+#import <webrtc/api/peerconnectioninterface.h> > #import <wtf/NeverDestroyed.h> > > using namespace WebCore; >@@ -52,6 +54,9 @@ void WebPlatformStrategies::initializeIfNecessary() > > WebPlatformStrategies::WebPlatformStrategies() > { >+#if ENABLE(IBWEBRTC_ENDPOINT) >+ initializeLibWebRTCInternalsWithSocketServer(); >+#endif > } > > CookiesStrategy* WebPlatformStrategies::createCookiesStrategy() >@@ -74,6 +79,13 @@ BlobRegistry* WebPlatformStrategies::createBlobRegistry() > return new WebCore::BlobRegistryImpl; > } > >+#if ENABLE(IBWEBRTC_ENDPOINT) >+rtc::scoped_refptr<webrtc::PeerConnectionInterface> WebPlatformStrategies::createPeerConnection(webrtc::PeerConnectionObserver& observer) >+{ >+ return WebCore::createPeerConnection(observer); >+} >+#endif >+ > String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url) > { > return WebCore::cookiesForDOM(session, firstParty, url);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=299516">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 167305
:
299516
|
299557
|
299604
|
299610
|
299705