Changeset 142790 in webkit
- Timestamp:
- Feb 13, 2013 1:47:05 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r142785 r142790 1 2013-02-13 Jochen Eisinger <jochen@chromium.org> 2 3 [chromium] fix TestRunner build with enable_webrtc=0 4 https://bugs.webkit.org/show_bug.cgi?id=109700 5 6 Reviewed by Tony Chang. 7 8 We can't use ENABLE() macros in the TestRunner library, however, 9 ENABLE_WEBRTC is defined by build/common.gypi, so we can use it. 10 11 * DumpRenderTree/chromium/TestRunner/src/MockConstraints.cpp: 12 * DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp: 13 * DumpRenderTree/chromium/TestRunner/src/MockWebRTCDTMFSenderHandler.cpp: 14 * DumpRenderTree/chromium/TestRunner/src/MockWebRTCDataChannelHandler.cpp: 15 * DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp: 16 * DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp: 17 (WebTestRunner): 18 * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp: 19 (WebTestRunner::WebTestProxyBase::userMediaClient): 20 * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp: 21 1 22 2013-02-12 Roger Fong <roger_fong@apple.com> 2 23 -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockConstraints.cpp
r142593 r142790 30 30 31 31 #include "config.h" 32 33 #if ENABLE_WEBRTC 32 34 #include "MockConstraints.h" 33 35 … … 78 80 79 81 } 82 83 #endif // ENABLE_WEBRTC -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp
r142593 r142790 30 30 31 31 #include "config.h" 32 33 #if ENABLE_WEBRTC 32 34 #include "MockWebMediaStreamCenter.h" 33 35 … … 110 112 111 113 } 114 115 #endif // ENABLE_WEBRTC -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDTMFSenderHandler.cpp
r142593 r142790 25 25 26 26 #include "config.h" 27 28 #if ENABLE_WEBRTC 27 29 #include "MockWebRTCDTMFSenderHandler.h" 28 30 … … 93 95 94 96 } 97 98 #endif // ENABLE_WEBRTC -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDataChannelHandler.cpp
r142593 r142790 24 24 25 25 #include "config.h" 26 27 #if ENABLE_WEBRTC 26 28 #include "MockWebRTCDataChannelHandler.h" 27 29 … … 96 98 97 99 } 100 101 #endif // ENABLE_WEBRTC -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp
r142593 r142790 30 30 31 31 #include "config.h" 32 33 #if ENABLE_WEBRTC 32 34 #include "MockWebRTCPeerConnectionHandler.h" 33 35 … … 310 312 311 313 } 314 315 #endif // ENABLE_WEBRTC -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp
r142593 r142790 90 90 } 91 91 92 #if ENABLE_WEBRTC 92 93 WebMediaStreamCenter* WebTestInterfaces::createMediaStreamCenter(WebMediaStreamCenterClient* client) 93 94 { … … 99 100 return new MockWebRTCPeerConnectionHandler(client, m_interfaces.get()); 100 101 } 102 #endif // ENABLE_WEBRTC 101 103 102 104 } -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp
r142684 r142790 781 781 WebUserMediaClient* WebTestProxyBase::userMediaClient() 782 782 { 783 #if ENABLE_WEBRTC 783 784 if (!m_userMediaClient.get()) 784 785 m_userMediaClient = auto_ptr<WebUserMediaClientMock>(new WebUserMediaClientMock(m_delegate)); 785 786 return m_userMediaClient.get(); 787 #else 788 return 0; 789 #endif // ENABLE_WEBRTC 786 790 } 787 791 -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp
r142773 r142790 30 30 31 31 #include "config.h" 32 33 #if ENABLE_WEBRTC 32 34 #include "WebUserMediaClientMock.h" 33 35 … … 132 134 133 135 } 136 137 #endif // ENABLE_WEBRTC
Note: See TracChangeset
for help on using the changeset viewer.