| Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| index 3ed7aa598216ba23122395ee5537bd0851e46774..8bcc48dc54ab4be24eabd48d1d450c7ad3d8fdff 100644
|
| --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| @@ -2089,11 +2089,11 @@ void PluginInstance::DeliverSamples(PP_Instance instance,
|
| content_decryptor_delegate_->DeliverSamples(audio_frames, block_info);
|
| }
|
|
|
| -unsigned PluginInstance::prepareTexture(cc::ResourceUpdateQueue&) {
|
| +unsigned PluginInstance::PrepareTexture(cc::ResourceUpdateQueue* queue) {
|
| return GetBackingTextureId();
|
| }
|
|
|
| -WebKit::WebGraphicsContext3D* PluginInstance::context() {
|
| +WebKit::WebGraphicsContext3D* PluginInstance::Context3d() {
|
| DCHECK(bound_graphics_3d_.get());
|
| DCHECK(bound_graphics_3d_->platform_context());
|
| return bound_graphics_3d_->platform_context()->GetParentContext();
|
|
|