Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(985)

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 12670009: cc: Chromify TextureLayerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698