Changeset 212704 in webkit


Ignore:
Timestamp:
Feb 21, 2017 12:19:34 AM (7 years ago)
Author:
achristensen@apple.com
Message:

Unreviewed, rolling out r212699.

Internal build not ready

Reverted changeset:

"[WebRTC][Mac] Activate libwebrtc"
​https://bugs.webkit.org/show_bug.cgi?id=167293
​http://trac.webkit.org/changeset/212699

Location:
trunk
Files:
11 deleted
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r212699 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Youenn Fablet  <youenn@apple.com>
    214

  • trunk/LayoutTests/TestExpectations

    r212699 r212704  
    693693webrtc [ Skip ]
    694694fast/mediastream/getUserMedia-webaudio.html [ Skip ]
    695 fast/mediastream/RTCPeerConnection-AddRemoveStream.html [ Skip ]
    696 fast/mediastream/RTCPeerConnection-closed-state.html [ Skip ]
    697 fast/mediastream/RTCPeerConnection-iceconnectionstatechange-event.html [ Skip ]
    698 fast/mediastream/RTCPeerConnection-more-media-to-negotiate.html [ Skip ]
    699 fast/mediastream/RTCPeerConnection-onnegotiationneeded.html [ Skip ]
    700 fast/mediastream/RTCPeerConnection-overloaded-operations-params.html [ Skip ]
    701 fast/mediastream/RTCRtpSender-replaceTrack.html [ Skip ]
    702 fast/mediastream/RTCPeerConnection-icecandidate-event.html [ Pass Failure ]
    703695
    704696# Only iOS WK1 has testRunner.setPagePaused.

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt

    r212699 r212704  
    1212*** Define sdpMid, badSdpMid, sdpMLineIndex and badSdpMLineIndex for testing
    1313PASS sdpMLineIndex is not badSdpMLineIndex
    14 FAIL Error in promise chain: TypeError: undefined is not an object (evaluating 'pc.getTransceivers()[0].mid')
     14PASS sdpMid is not null
     15PASS sdpMid is not badSdpMid
     16PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: badSdpMid})) rejected with OperationError (DOM Exception 34): sdpMid did not match any media description
     17PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMLineIndex: badSdpMLineIndex})) rejected with OperationError (DOM Exception 34): sdpMLineIndex is out of range
     18*** A (bad) sdpMid takes precedesce over valid sdpMLineIndex
     19PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: badSdpMid, sdpMLineIndex: sdpMLineIndex})) rejected with OperationError (DOM Exception 34): sdpMid did not match any media description
     20*** Test bad candidate content with valid sdpMid
     21PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMid: sdpMid})) rejected with OperationError (DOM Exception 34): Invalid candidate content
     22*** Test bad candidate content with valid sdpMLineIndex
     23PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMLineIndex: sdpMLineIndex})) rejected with OperationError (DOM Exception 34): Invalid candidate content
     24
     25*** Test some OK input
     26PASS promise pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid}) fulfilled with undefined
     27PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMLineIndex: sdpMLineIndex})) fulfilled with undefined
     28*** A valid sdpMid takes precedesce over a bad sdpMLineIndex
     29PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: sdpMid, sdpMLineIndex: badSdpMLineIndex})) fulfilled with undefined
     30PASS End of test promise chain
    1531PASS successfullyParsed is true
    1632

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender-expected.txt

    r212699 r212704  
    55
    66*** Remote description with audio offer set
    7 FAIL pc.getSenders().length should be 1. Was 0.
    8 FAIL pc.getReceivers().length should be 1. Was 0.
    9 FAIL pc.getReceivers()[0].track.kind should be audio. Threw exception TypeError: undefined is not an object (evaluating 'pc.getReceivers()[0].track')
    10 FAIL pc.getTransceivers().length should be 1. Was 0.
     7PASS pc.getSenders().length is 1
     8PASS pc.getReceivers().length is 1
     9PASS pc.getReceivers()[0].track.kind is 'audio'
     10PASS pc.getTransceivers().length is 1
    1111
    1212*** Check unused sender
    1313audioSender = pc.getSenders()[0]
    14 FAIL audioSender.track should be null. Threw exception TypeError: undefined is not an object (evaluating 'audioSender.track')
     14PASS audioSender.track is null
    1515
    1616*** Adding a video track should not reuse audioSender (wrong kind)
    … …  
    1919
    2020*** An extra sender should have been added
    21 FAIL pc.getSenders().length should be 2. Was 1.
    22 FAIL pc.getSenders().includes(audioSender) should be true. Was false.
     21PASS pc.getSenders().length is 2
     22PASS pc.getSenders().includes(audioSender) is true
    2323PASS pc.getSenders().includes(senderFromAddTrack) is true
    2424
    2525*** Adding an audio track should reuse audioSender
    2626senderFromAddTrack = pc.addTrack(audioTrack, stream)
    27 FAIL senderFromAddTrack should be undefined (of type undefined). Was [object RTCRtpSender] (of type object).
    28 FAIL audioSender.track should be [object MediaStreamTrack]. Threw exception TypeError: undefined is not an object (evaluating 'audioSender.track')
     27PASS senderFromAddTrack is audioSender
     28PASS audioSender.track is audioTrack
    2929
    3030*** The number of senders should not have changed

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-icecandidate-event-expected.txt

    r212699 r212704  
    44
    55
    6 PASS Got candidate
    7 PASS event.candidate instanceof RTCIceCandidate is true
    8 PASS event.candidate.sdpMLineIndex is 0
    9 FAIL event.candidate.sdpMid should be null (of type object). Was 1 (of type string).
    10 PASS event.candidate.candidate: 2013266431 1 udp 2013266432 192.168.0.100 38838 typ host generation 0
    116PASS Local description set
    127PASS End of test promise chain
    … …  
    149PASS event.candidate instanceof RTCIceCandidate is true
    1510PASS event.candidate.sdpMLineIndex is 0
    16 FAIL event.candidate.sdpMid should be null (of type object). Was 1 (of type string).
    17 PASS event.candidate.candidate: 1019216383 1 tcp 1019216384 192.168.0.100 9 typ host tcptype passive generation 0
     11PASS event.candidate.sdpMid is pc.getTransceivers()[0].mid
     12PASS event.candidate.candidate: candidate:1 1 UDP 2013266431 192.168.0.100 38838 typ host
     13
    1814PASS Got candidate
    1915PASS event.candidate instanceof RTCIceCandidate is true
    2016PASS event.candidate.sdpMLineIndex is 0
    21 FAIL event.candidate.sdpMid should be null (of type object). Was 1 (of type string).
    22 PASS event.candidate.candidate: 1677722111 1 tcp 1677722112 172.18.0.1 47989 typ srflx raddr 192.168.0.100 rport 47989 generation 0
     17PASS event.candidate.sdpMid is pc.getTransceivers()[0].mid
     18PASS event.candidate.candidate: candidate:2 1 TCP 1019216383 192.168.0.100 9 typ host tcptype active
     19
     20PASS Got candidate
     21PASS event.candidate instanceof RTCIceCandidate is true
     22PASS event.candidate.sdpMLineIndex is 0
     23PASS event.candidate.sdpMid is pc.getTransceivers()[0].mid
     24PASS event.candidate.candidate: candidate:3 1 UDP 1677722111 172.18.0.1 47989 typ srflx raddr 192.168.0.100 rport 47989
     25
    2326PASS Got end of candidates
    2427PASS event.candidate is null

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api-expected.txt

    r212699 r212704  
    4949Create remote offer
    5050Got remote offer, set it
     51PASS Got 'addstream' event (before setRemoteDescription promise fulfilled)
     52PASS remoteStream.getTracks().length is 2
     53PASS pc.getRemoteStreams().length is 1
     54PASS pc.getRemoteStreams()[0] is remoteStream
     55PASS pc.getStreamById(remoteStream.id) is remoteStream
    5156Remote offer set
    5257PASS End of test promise chain

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r212699 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Youenn Fablet  <youennf@gmail.com>
    214

  • trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/datachannel-emptystring-expected.txt

    r212699 r212704  
    11
    2 FAIL Can send empty strings across a WebRTC data channel. assert_unreached: Error TypeError: Argument 1 ('description') to RTCPeerConnection.setRemoteDescription must be an instance of RTCSessionDescription Reached unreachable code
     2Harness Error (TIMEOUT), message = null
     3
     4TIMEOUT Can send empty strings across a WebRTC data channel. Test timed out
    35Messages exchanged
    46
     7Sent: [empty string]
     8Sent: "done"
    59

  • trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/no-media-call-expected.txt

    r212699 r212704  
    11
    2 FAIL Can set up a basic WebRTC call with no data. assert_unreached: WebRTC called error callback for setRemoteDescription first Reached unreachable code
     2Harness Error (TIMEOUT), message = null
     3
     4TIMEOUT Can set up a basic WebRTC call with no data. Test timed out
    35iceConnectionState info
    46

  • trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/promises-call-expected.txt

    r212699 r212704  
    11
    2 FAIL Can set up a basic WebRTC call with only data using promises. assert_unreached: Error TypeError: Argument 1 ('description') to RTCPeerConnection.setRemoteDescription must be an instance of RTCSessionDescription happened at step Set remote description at second Reached unreachable code
     2Harness Error (TIMEOUT), message = null
     3
     4TIMEOUT Can set up a basic WebRTC call with only data using promises. Test timed out
    35iceConnectionState info
    46

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r212699 r212704  
    340340webkit.org/b/160996 fast/mediastream/MediaStream-video-element-video-tracks-disabled.html [ ImageOnlyFailure ]
    341341webkit.org/b/161956 fast/mediastream/MediaStream-video-element-displays-buffer.html [ Failure ]
    342 
    343 # Test skipped in the main expectation file.
    344 fast/mediastream/RTCPeerConnection-AddRemoveStream.html [ Pass ]
    345 fast/mediastream/RTCPeerConnection-closed-state.html [ Pass ]
    346 fast/mediastream/RTCPeerConnection-iceconnectionstatechange-event.html [ Pass ]
    347 fast/mediastream/RTCPeerConnection-more-media-to-negotiate.html [ Pass ]
    348 fast/mediastream/RTCPeerConnection-onnegotiationneeded.html [ Pass ]
    349 fast/mediastream/RTCPeerConnection-overloaded-operations-params.html [ Pass ]
    350 fast/mediastream/RTCRtpSender-replaceTrack.html [ Pass ]
    351342
    352343# Proximity Events is not supported.

  • trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations

    r212699 r212704  
    19161916
    19171917webkit.org/b/167258 media/modern-media-controls/audio/audio-controls-metrics.html [ Skip ]
    1918 
    1919 imported/w3c/web-platform-tests/webrtc [ Skip ]

  • trunk/LayoutTests/platform/mac-wk1/TestExpectations

    r212699 r212704  
    9494http/tests/media/media-stream
    9595http/tests/ssl/media-stream
    96 
    97 # Skip WebRTC for now in WK1
    98 imported/w3c/web-platform-tests/webrtc [ Skip ]
    9996
    10097# These tests test the Shadow DOM based HTML form validation UI but Mac WK1 is using native dialogs instead.

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r212699 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Youenn Fablet  <youenn@apple.com>
    214

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

    r212699 r212704  
    99HEADER_SEARCH_PATHS = Source Source/third_party/jsoncpp/source/include Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/third_party/usrsctp/usrsctplib Source/third_party/usrsctp/usrsctplib/usrsctplib Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet Source/webrtc/modules/audio_device/ios;
    1010
     11INSTALL_PATH = /usr/local/lib;
    1112PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
    1213USE_HEADERMAP = NO;
    … …  
    2122EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse.cc *_sse2.cc macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc;
    2223EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc;
    23 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = voice_processing_audio_unit.mm;
     24EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = audio_device_ios.mm voice_processing_audio_unit.mm audio_device_not_implemented_ios.mm RTCAudioSessionConfiguration.m RTCAudioSessionDelegateAdapter.mm RTCAudioSession.mm RTCAudioSession+Configuration.mm RTCUIApplication.mm;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h

    r212699 r212704  
    212212
    213213// This is identical to LogMessageVoidify but in name.
    214 class FatalMessageVoidify {
     214class WEBRTC_EXPORT FatalMessageVoidify {
    215215 public:
    216216  FatalMessageVoidify() { }

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r212699 r212704  
    24142414                5CFD53811E4BA4F500482908 /* voice_processing_audio_unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD537A1E4BA4F500482908 /* voice_processing_audio_unit.h */; };
    24152415                5CFD53821E4BA4F500482908 /* voice_processing_audio_unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
     2416                5CFD53841E4BBD8D00482908 /* audio_device_not_implemented_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53831E4BBD8D00482908 /* audio_device_not_implemented_ios.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24162417                5CFD538D1E4BD3A300482908 /* compare_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53851E4BD3A300482908 /* compare_neon.cc */; };
    24172418                5CFD538E1E4BD3A300482908 /* compare_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53861E4BD3A300482908 /* compare_neon64.cc */; };
    … …  
    1102311024                                5C119FFE1E457400004F0987 /* audio_device_generic.cc in Sources */,
    1102411025                                5C11A00B1E457448004F0987 /* audio_device_mac.cc in Sources */,
     11026                                5CFD53841E4BBD8D00482908 /* audio_device_not_implemented_ios.mm in Sources */,
    1102511027                                5CDD84171E439B2900621E92 /* audio_encoder.cc in Sources */,
    1102611028                                5CDD8CA71E43C6F700621E92 /* audio_encoder_cng.cc in Sources */,

  • trunk/Source/WTF/ChangeLog

    r212699 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Youenn Fablet  <youenn@apple.com>
    214

  • trunk/Source/WTF/wtf/Platform.h

    r212699 r212704  
    12091209#endif /* PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 */
    12101210
    1211 #if PLATFORM(MAC)
    1212 #define USE_LIBWEBRTC 1
    1213 #endif
    1214 
    12151211#endif /* WTF_Platform_h */

  • trunk/Source/WebCore/ChangeLog

    r212703 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r212699 r212704  
    7272OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface -framework GraphicsServices;
    7373OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);
    74 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework CoreAudio -framework DataDetectorsCore -framework IOSurface -framework OpenGL -framework SystemConfiguration -framework VideoToolbox -framework CoreMedia -weak-lwebrtc;
     74OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework CoreAudio -framework DataDetectorsCore -framework IOSurface -framework OpenGL -framework SystemConfiguration;
    7575
    7676SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));

  • trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

    r212699 r212704  
    5050GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    5151OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    52 OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit -weak-lwebrtc;
    53 
     52OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit;
    5453OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
    5554OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;

  • trunk/Source/WebKit2/ChangeLog

    r212703 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r212699 r212704  
    4646
    4747OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy -sub_umbrella WebKitLegacy;
    48 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -sub_umbrella WebCore -weak-lwebrtc;
     48OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -sub_umbrella WebCore;
    4949OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = -lAccessibility;
    5050OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = -lAccessibility;

  • trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

    r212699 r212704  
    306306//   wider testing).
    307307
    308 // Disable webrtc feature if libwebrtc library is not present
    309 namespace WebKit {
    310 bool checkWebRTCAvailability();
    311 }
    312 
    313308#define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
    314309    macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Spring Animations", "CSS Spring Animation prototype") \
    … …  
    317312    macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Modern Media Controls", "Use modern media controls look") \
    318313    macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
    319     macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, checkWebRTCAvailability(), "WebRTC", "Enable WebRTC API") \
     314    macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, false, "WebRTC", "Enable WebRTC API") \
    320315    macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
    321316    macro(UserTimingEnabled, userTimingEnabled, Bool, bool, false, "User Timing", "Enable UserTiming API") \

  • trunk/Source/WebKit2/UIProcess/WebPreferences.cpp

    r212699 r212704  
    3030#include "WebPreferencesKeys.h"
    3131#include "WebProcessPool.h"
    32 #include <dlfcn.h>
    3332#include <wtf/NeverDestroyed.h>
    3433#include <wtf/ThreadingPrimitives.h>
    … …  
    197196#undef DEFINE_PREFERENCE_GETTER_AND_SETTERS
    198197
    199 bool checkWebRTCAvailability()
    200 {
    201 #if USE(LIBWEBRTC)
    202     void* libwebrtcLibrary = dlopen("libwebrtc.dylib", RTLD_NOW);
    203     if (!libwebrtcLibrary)
    204         return false;
    205     dlclose(libwebrtcLibrary);
    206     return true;
    207 #else
    208     return true;
    209 #endif
    210 }
    211 
    212198#define DEFINE_EXPERIMENTAL_PREFERENCE_GETTER_AND_SETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
    213199    void WebPreferences::set##KeyUpper(const Type& value) \

  • trunk/Tools/ChangeLog

    r212703 r212704  
     12017-02-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212699.
     4
     5        Internal build not ready
     6
     7        Reverted changeset:
     8
     9        "[WebRTC][Mac] Activate libwebrtc"
     10        https://bugs.webkit.org/show_bug.cgi?id=167293
     11        http://trac.webkit.org/changeset/212699
     12
    1132017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

  • trunk/Tools/Scripts/build-webkit

    r212699 r212704  
    185185    # ANGLE and libwebrtc must come before WebCore
    186186    splice @projects, 0, 0, ("Source/ThirdParty/ANGLE");
    187     splice @projects, 0, 0, ("Source/ThirdParty/libwebrtc");
    188187
    189188    push @projects, ("Source/WebKit2");

  • trunk/Tools/Scripts/webkitdirs.pm

    r212699 r212704  
    21382138    prependToEnvironmentVariableList("DYLD_FRAMEWORK_PATH", $dyldFrameworkPath);
    21392139    prependToEnvironmentVariableList("__XPC_DYLD_FRAMEWORK_PATH", $dyldFrameworkPath);
    2140     prependToEnvironmentVariableList("DYLD_LIBRARY_PATH", $dyldFrameworkPath);
    2141     prependToEnvironmentVariableList("__XPC_DYLD_LIBRARY_PATH", $dyldFrameworkPath);
    21422140    $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
    21432141
    … …  
    21522150    prependToEnvironmentVariableList("DYLD_FRAMEWORK_PATH", $dyldFrameworkPath);
    21532151    prependToEnvironmentVariableList("DYLD_LIBRARY_PATH", $dyldFrameworkPath);
    2154     prependToEnvironmentVariableList("DYLD_LIBRARY_PATH", $dyldFrameworkPath);
    2155     prependToEnvironmentVariableList("__XPC_DYLD_LIBRARY_PATH", $dyldFrameworkPath);
    21562152
    21572153    setUpGuardMallocIfNeeded();
Note: See TracChangeset for help on using the changeset viewer.