Index: webkit/support/webkit_support.h |
=================================================================== |
--- webkit/support/webkit_support.h (revision 116514) |
+++ webkit/support/webkit_support.h (working copy) |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -39,6 +39,8 @@ |
// implementation classes. |
namespace webkit_support { |
+class TestMediaStreamClient; |
+ |
// Initializes or terminates a test environment. |
// |unit_test_mode| should be set to true when running in a TestSuite, in which |
// case no AtExitManager is created and ICU is not initialized (as it is already |
@@ -63,9 +65,16 @@ |
const WebKit::WebPluginParams& params); |
// This is used by WebFrameClient::createMediaPlayer(). |
-WebKit::WebMediaPlayer* CreateMediaPlayer(WebKit::WebFrame* frame, |
- WebKit::WebMediaPlayerClient* client); |
+WebKit::WebMediaPlayer* CreateMediaPlayer( |
+ WebKit::WebFrame* frame, |
+ WebKit::WebMediaPlayerClient* client, |
+ webkit_support::TestMediaStreamClient* test_media_stream_client); |
acolwell GONE FROM CHROMIUM
2012/01/06 18:09:16
Is there any reason why this can't just be MediaSt
wjia(left Chromium)
2012/01/06 22:18:59
changed to MediaStreamClient.
|
+// This is used by WebFrameClient::createMediaPlayer(). |
+WebKit::WebMediaPlayer* CreateMediaPlayer( |
+ WebKit::WebFrame* frame, |
+ WebKit::WebMediaPlayerClient* client); |
+ |
// This is used by WebFrameClient::createApplicationCacheHost(). |
WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); |