| Index: webkit/plugins/ppapi/ppb_audio_impl.cc
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_audio_impl.cc (revision 106515)
|
| +++ webkit/plugins/ppapi/ppb_audio_impl.cc (working copy)
|
| @@ -17,6 +17,7 @@
|
| #include "webkit/plugins/ppapi/common.h"
|
| #include "webkit/plugins/ppapi/resource_helper.h"
|
|
|
| +using ppapi::PpapiGlobals;
|
| using ppapi::thunk::EnterResourceNoLock;
|
| using ppapi::thunk::PPB_Audio_API;
|
| using ppapi::thunk::PPB_AudioConfig_API;
|
| @@ -94,7 +95,7 @@
|
|
|
| PP_Resource PPB_Audio_Impl::GetCurrentConfig() {
|
| // AddRef on behalf of caller, while keeping a ref for ourselves.
|
| - ::ppapi::TrackerBase::Get()->GetResourceTracker()->AddRefResource(config_);
|
| + PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(config_);
|
| return config_;
|
| }
|
|
|
|
|
| Property changes on: webkit/plugins/ppapi/ppb_audio_impl.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
| Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_audio_impl.cc:r3734-4217,4606-5108,5177-5263
|
|
|
|
|