Diff
Modified: trunk/Tools/ChangeLog (142789 => 142790)
--- trunk/Tools/ChangeLog 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/ChangeLog 2013-02-13 21:47:05 UTC (rev 142790)
@@ -1,3 +1,24 @@
+2013-02-13 Jochen Eisinger <[email protected]>
+
+ [chromium] fix TestRunner build with enable_webrtc=0
+ https://bugs.webkit.org/show_bug.cgi?id=109700
+
+ Reviewed by Tony Chang.
+
+ We can't use ENABLE() macros in the TestRunner library, however,
+ ENABLE_WEBRTC is defined by build/common.gypi, so we can use it.
+
+ * DumpRenderTree/chromium/TestRunner/src/MockConstraints.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/MockWebRTCDTMFSenderHandler.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/MockWebRTCDataChannelHandler.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp:
+ (WebTestRunner):
+ * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+ (WebTestRunner::WebTestProxyBase::userMediaClient):
+ * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp:
+
2013-02-12 Roger Fong <[email protected]>
TestWebKitAPI and record-memory projects and property sheets for VS2010.
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockConstraints.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockConstraints.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockConstraints.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -29,6 +29,8 @@
*/
#include "config.h"
+
+#if ENABLE_WEBRTC
#include "MockConstraints.h"
#include <public/WebMediaConstraints.h>
@@ -77,3 +79,5 @@
}
}
+
+#endif // ENABLE_WEBRTC
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -29,6 +29,8 @@
*/
#include "config.h"
+
+#if ENABLE_WEBRTC
#include "MockWebMediaStreamCenter.h"
#include <public/WebAudioDestinationConsumer.h>
@@ -109,3 +111,5 @@
}
}
+
+#endif // ENABLE_WEBRTC
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDTMFSenderHandler.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDTMFSenderHandler.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDTMFSenderHandler.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -24,6 +24,8 @@
*/
#include "config.h"
+
+#if ENABLE_WEBRTC
#include "MockWebRTCDTMFSenderHandler.h"
#include "WebTestDelegate.h"
@@ -92,3 +94,5 @@
}
}
+
+#endif // ENABLE_WEBRTC
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDataChannelHandler.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDataChannelHandler.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCDataChannelHandler.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -23,6 +23,8 @@
*/
#include "config.h"
+
+#if ENABLE_WEBRTC
#include "MockWebRTCDataChannelHandler.h"
#include "WebTestDelegate.h"
@@ -95,3 +97,5 @@
}
}
+
+#endif // ENABLE_WEBRTC
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -29,6 +29,8 @@
*/
#include "config.h"
+
+#if ENABLE_WEBRTC
#include "MockWebRTCPeerConnectionHandler.h"
#include "MockConstraints.h"
@@ -309,3 +311,5 @@
}
}
+
+#endif // ENABLE_WEBRTC
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -89,6 +89,7 @@
return m_interfaces.get();
}
+#if ENABLE_WEBRTC
WebMediaStreamCenter* WebTestInterfaces::createMediaStreamCenter(WebMediaStreamCenterClient* client)
{
return new MockWebMediaStreamCenter(client);
@@ -98,5 +99,6 @@
{
return new MockWebRTCPeerConnectionHandler(client, m_interfaces.get());
}
+#endif // ENABLE_WEBRTC
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -780,9 +780,13 @@
WebUserMediaClient* WebTestProxyBase::userMediaClient()
{
+#if ENABLE_WEBRTC
if (!m_userMediaClient.get())
m_userMediaClient = auto_ptr<WebUserMediaClientMock>(new WebUserMediaClientMock(m_delegate));
return m_userMediaClient.get();
+#else
+ return 0;
+#endif // ENABLE_WEBRTC
}
// Simulate a print by going into print mode and then exit straight away.
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp (142789 => 142790)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp 2013-02-13 21:40:03 UTC (rev 142789)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp 2013-02-13 21:47:05 UTC (rev 142790)
@@ -29,6 +29,8 @@
*/
#include "config.h"
+
+#if ENABLE_WEBRTC
#include "WebUserMediaClientMock.h"
#include "MockConstraints.h"
@@ -131,3 +133,5 @@
}
}
+
+#endif // ENABLE_WEBRTC
