Context Navigation

Changeset 142790 in webkit

Timestamp:

Feb 13, 2013 1:47:05 PM (11 years ago)

Author:

jochen@chromium.org

Message:

[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.

(WebTestRunner):

(WebTestRunner::WebTestProxyBase::userMediaClient):

Location:

trunk/Tools

Files:

-                      r142785
+                      r142790
+-02-13  Jochen Eisinger  <jochen@chromium.org>
+        [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:
 -02-12  Roger Fong  <roger_fong@apple.com>

-                      r142593
+                      r142790
 #include "config.h"
+#if ENABLE_WEBRTC
 #include "MockConstraints.h"
 …
+}
+#endif // ENABLE_WEBRTC

-                      r142593
+                      r142790
 #include "config.h"
+#if ENABLE_WEBRTC
 #include "MockWebMediaStreamCenter.h"
 …
+}
+#endif // ENABLE_WEBRTC

-                      r142593
+                      r142790
 #include "config.h"
+#if ENABLE_WEBRTC
 #include "MockWebRTCDTMFSenderHandler.h"
 …
+}
+#endif // ENABLE_WEBRTC

-                      r142593
+                      r142790
 #include "config.h"
+#if ENABLE_WEBRTC
 #include "MockWebRTCDataChannelHandler.h"
 …
+}
+#endif // ENABLE_WEBRTC

-                      r142593
+                      r142790
 #include "config.h"
+#if ENABLE_WEBRTC
 #include "MockWebRTCPeerConnectionHandler.h"
 …
+}
+#endif // ENABLE_WEBRTC

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	}

-                      r142684
+                      r142790
 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
+}

-                      r142773
+                      r142790
 #include "config.h"
+#if ENABLE_WEBRTC
 #include "WebUserMediaClientMock.h"
 …
+}
+#endif // ENABLE_WEBRTC

Note: See TracChangeset for help on using the changeset viewer.