| Index: webkit/plugins/ppapi/mock_plugin_delegate.h
|
| ===================================================================
|
| --- webkit/plugins/ppapi/mock_plugin_delegate.h (revision 110608)
|
| +++ webkit/plugins/ppapi/mock_plugin_delegate.h (working copy)
|
| @@ -34,7 +34,11 @@
|
| media::VideoCapture::EventHandler* handler);
|
| virtual PlatformAudio* CreateAudio(uint32_t sample_rate,
|
| uint32_t sample_count,
|
| - PlatformAudio::Client* client);
|
| + PlatformAudioCommonClient* client);
|
| + virtual PlatformAudioInput* CreateAudioInput(
|
| + uint32_t sample_rate,
|
| + uint32_t sample_count,
|
| + PlatformAudioCommonClient* client);
|
| virtual PpapiBroker* ConnectToPpapiBroker(PPB_Broker_Impl* client);
|
| virtual void NumberOfFindResultsChanged(int identifier,
|
| int total,
|
|
|
| Property changes on: webkit/plugins/ppapi/mock_plugin_delegate.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/mock_plugin_delegate.h:r3734-4217,4606-5108,5177-5263
|
|
|
|
|