| Index: content/renderer/pepper/ppb_audio_impl.h
|
| diff --git a/content/renderer/pepper/ppb_audio_impl.h b/content/renderer/pepper/ppb_audio_impl.h
|
| index 62a4dd275b18a93e1f6f184f3b0490b84efeff1b..814b88f41128acdb35b43af4e364dd53bfb5ec41 100644
|
| --- a/content/renderer/pepper/ppb_audio_impl.h
|
| +++ b/content/renderer/pepper/ppb_audio_impl.h
|
| @@ -37,12 +37,12 @@ class PPB_Audio_Impl : public ::ppapi::Resource,
|
| // and will return 0 on failure.
|
| static PP_Resource Create(PP_Instance instance,
|
| PP_Resource config_id,
|
| - PPB_Audio_Callback audio_callback,
|
| + const ppapi::AudioCallbackCombined& audio_callback,
|
| void* user_data);
|
|
|
| // Initialization function for trusted init.
|
| bool Init(PP_Resource config_id,
|
| - PPB_Audio_Callback user_callback,
|
| + const ppapi::AudioCallbackCombined& user_callback,
|
| void* user_data);
|
|
|
| // Resource overrides.
|
| @@ -67,15 +67,12 @@ class PPB_Audio_Impl : public ::ppapi::Resource,
|
| base::SyncSocket::Handle socket) OVERRIDE;
|
|
|
| // AudioConfig used for creating this Audio object. We own a ref.
|
| - ::ppapi::ScopedPPResource config_;
|
| + ppapi::ScopedPPResource config_;
|
|
|
| // PluginDelegate audio object that we delegate audio IPC through. We don't
|
| // own this pointer but are responsible for calling Shutdown on it.
|
| PepperPlatformAudioOutput* audio_;
|
|
|
| - // Track frame count for passing on to PPB_Audio_Shared::SetStreamInfo().
|
| - int sample_frame_count_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Impl);
|
| };
|
|
|
|
|