Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (108486 => 108487)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-22 13:25:11 UTC (rev 108487)
@@ -1,3 +1,12 @@
+2012-02-22 Hao Zheng <[email protected]>
+
+ [chromium] Build WebKit with MEDIA_STREAM disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=79214
+
+ Reviewed by Kent Tamura.
+
+ * src/UserMediaClientImpl.h:
+
2012-02-20 Roland Steiner <[email protected]>
<style scoped>: Add runtime-flag
Modified: trunk/Source/WebKit/chromium/src/UserMediaClientImpl.h (108486 => 108487)
--- trunk/Source/WebKit/chromium/src/UserMediaClientImpl.h 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Source/WebKit/chromium/src/UserMediaClientImpl.h 2012-02-22 13:25:11 UTC (rev 108487)
@@ -31,6 +31,8 @@
#ifndef UserMediaClientImpl_h
#define UserMediaClientImpl_h
+#if ENABLE(MEDIA_STREAM)
+
#include "MediaStreamSource.h"
#include "UserMediaClient.h"
#include <wtf/PassRefPtr.h>
@@ -61,4 +63,6 @@
} // namespace WebKit
+#endif // ENABLE(MEDIA_STREAM)
+
#endif // UserMediaClientImpl_h
Modified: trunk/Tools/ChangeLog (108486 => 108487)
--- trunk/Tools/ChangeLog 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Tools/ChangeLog 2012-02-22 13:25:11 UTC (rev 108487)
@@ -1,3 +1,17 @@
+2012-02-22 Hao Zheng <[email protected]>
+
+ [chromium] Build WebKit with MEDIA_STREAM disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=79214
+
+ Reviewed by Kent Tamura.
+
+ * DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
+ * DumpRenderTree/chromium/WebUserMediaClientMock.h:
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::createMediaPlayer):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-02-22 Zeno Albisser <[email protected]>
[Qt][WK2][Mac] WebKitTestRunner does not build with clang.
Modified: trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp (108486 => 108487)
--- trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-02-22 13:25:11 UTC (rev 108487)
@@ -29,6 +29,8 @@
*/
#include "config.h"
+#if ENABLE(MEDIA_STREAM)
+
#include "WebUserMediaClientMock.h"
#include "WebMediaStreamRegistry.h"
@@ -81,3 +83,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h (108486 => 108487)
--- trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h 2012-02-22 13:25:11 UTC (rev 108487)
@@ -31,6 +31,8 @@
#ifndef WebUserMediaClientMock_h
#define WebUserMediaClientMock_h
+#if ENABLE(MEDIA_STREAM)
+
#include "WebUserMediaClient.h"
#include "platform/WebCommon.h"
#include "platform/WebString.h"
@@ -57,4 +59,6 @@
} // namespace WebKit
+#endif // ENABLE(MEDIA_STREAM)
+
#endif // WebUserMediaClientMock_h
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (108486 => 108487)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-02-22 13:25:11 UTC (rev 108487)
@@ -712,6 +712,7 @@
return deviceOrientationClientMock();
}
+#if ENABLE(MEDIA_STREAM)
WebUserMediaClient* WebViewHost::userMediaClient()
{
return userMediaClientMock();
@@ -723,6 +724,7 @@
m_userMediaClientMock = WebUserMediaClientMock::create();
return m_userMediaClientMock.get();
}
+#endif
// WebWidgetClient -----------------------------------------------------------
@@ -936,7 +938,11 @@
WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerClient* client)
{
+#if ENABLE(MEDIA_STREAM)
return webkit_support::CreateMediaPlayer(frame, client, testMediaStreamClient());
+#else
+ return webkit_support::CreateMediaPlayer(frame, client);
+#endif
}
WebApplicationCacheHost* WebViewHost::createApplicationCacheHost(WebFrame* frame, WebApplicationCacheHostClient* client)
@@ -1649,6 +1655,7 @@
webView()->didExitFullScreen();
}
+#if ENABLE(MEDIA_STREAM)
webkit_support::MediaStreamUtil* WebViewHost::mediaStreamUtil()
{
return userMediaClientMock();
@@ -1660,6 +1667,7 @@
m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamClient(mediaStreamUtil()));
return m_testMediaStreamClient.get();
}
+#endif
// Painting functions ---------------------------------------------------------
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (108486 => 108487)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-02-22 13:13:01 UTC (rev 108486)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-02-22 13:25:11 UTC (rev 108487)
@@ -163,7 +163,9 @@
virtual WebKit::WebGeolocationClient* geolocationClient();
virtual WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*);
virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
+#if ENABLE(MEDIA_STREAM)
virtual WebKit::WebUserMediaClient* userMediaClient();
+#endif
virtual void printPage(WebKit::WebFrame*);
// WebKit::WebWidgetClient
@@ -305,9 +307,11 @@
void didNotAcquirePointerLock();
#endif
+#if ENABLE(MEDIA_STREAM)
WebKit::WebUserMediaClientMock* userMediaClientMock();
webkit_support::MediaStreamUtil* mediaStreamUtil();
webkit_support::TestMediaStreamClient* testMediaStreamClient();
+#endif
// Causes navigation actions just printout the intended navigation instead
// of taking you to the page. This is used for cases like mailto, where you
@@ -385,8 +389,10 @@
OwnPtr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationClientMock;
OwnPtr<MockWebSpeechInputController> m_speechInputControllerMock;
+#if ENABLE(MEDIA_STREAM)
OwnPtr<WebKit::WebUserMediaClientMock> m_userMediaClientMock;
OwnPtr<webkit_support::TestMediaStreamClient> m_testMediaStreamClient;
+#endif
OwnPtr<TestNavigationController> m_navigationController;
