| Index: webkit/plugins/ppapi/resource_creation_impl.h
|
| ===================================================================
|
| --- webkit/plugins/ppapi/resource_creation_impl.h (revision 110608)
|
| +++ webkit/plugins/ppapi/resource_creation_impl.h (working copy)
|
| @@ -29,10 +29,16 @@
|
| PP_Resource config_id,
|
| PPB_Audio_Callback audio_callback,
|
| void* user_data) OVERRIDE;
|
| - virtual PP_Resource CreateAudioTrusted(PP_Instance instace) OVERRIDE;
|
| + virtual PP_Resource CreateAudioTrusted(PP_Instance instance) OVERRIDE;
|
| virtual PP_Resource CreateAudioConfig(PP_Instance instance,
|
| PP_AudioSampleRate sample_rate,
|
| uint32_t sample_frame_count) OVERRIDE;
|
| + virtual PP_Resource CreateAudioInput(
|
| + PP_Instance instance,
|
| + PP_Resource config_id,
|
| + PPB_AudioInput_Callback audio_input_callback,
|
| + void* user_data) OVERRIDE;
|
| + virtual PP_Resource CreateAudioInputTrusted(PP_Instance instance) OVERRIDE;
|
| virtual PP_Resource CreateBroker(PP_Instance instance) OVERRIDE;
|
| virtual PP_Resource CreateBuffer(PP_Instance instance,
|
| uint32_t size) OVERRIDE;
|
|
|
| Property changes on: webkit/plugins/ppapi/resource_creation_impl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/resource_creation_impl.h:r3734-4217,4606-5108,5177-5263
|
|
|
|
|