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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 12374028: Allow WebExternalTextureLayerClient to work with mailboxes. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 virtual void DeliverFrame(PP_Instance instance, 458 virtual void DeliverFrame(PP_Instance instance,
459 PP_Resource decrypted_frame, 459 PP_Resource decrypted_frame,
460 const PP_DecryptedFrameInfo* frame_info) OVERRIDE; 460 const PP_DecryptedFrameInfo* frame_info) OVERRIDE;
461 virtual void DeliverSamples(PP_Instance instance, 461 virtual void DeliverSamples(PP_Instance instance,
462 PP_Resource audio_frames, 462 PP_Resource audio_frames,
463 const PP_DecryptedBlockInfo* block_info) OVERRIDE; 463 const PP_DecryptedBlockInfo* block_info) OVERRIDE;
464 464
465 // TextureLayerClient implementation. 465 // TextureLayerClient implementation.
466 virtual unsigned PrepareTexture(cc::ResourceUpdateQueue* queue) OVERRIDE; 466 virtual unsigned PrepareTexture(cc::ResourceUpdateQueue* queue) OVERRIDE;
467 virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE; 467 virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE;
468 virtual bool PrepareTextureMailbox(cc::TextureMailbox*) OVERRIDE;
jamesr 2013/04/11 17:36:58 all parameters get a name in chromium style
alexst (slow to review) 2013/04/11 18:03:12 Done.
468 469
469 // Reset this instance as proxied. Assigns the instance a new module, resets 470 // Reset this instance as proxied. Assigns the instance a new module, resets
470 // cached interfaces to point to the out-of-process proxy and re-sends 471 // cached interfaces to point to the out-of-process proxy and re-sends
471 // DidCreate, DidChangeView, and HandleDocumentLoad (if necessary). 472 // DidCreate, DidChangeView, and HandleDocumentLoad (if necessary).
472 // This should be used only when switching a trusted NaCl in-process instance 473 // This should be used only when switching a trusted NaCl in-process instance
473 // to an untrusted NaCl out-of-process instance. 474 // to an untrusted NaCl out-of-process instance.
474 PP_NaClResult ResetAsProxied(scoped_refptr<PluginModule> module); 475 PP_NaClResult ResetAsProxied(scoped_refptr<PluginModule> module);
475 476
476 // Checks whether this is a valid instance of the given module. After calling 477 // Checks whether this is a valid instance of the given module. After calling
477 // ResetAsProxied above, a NaCl plugin instance's module changes, so external 478 // ResetAsProxied above, a NaCl plugin instance's module changes, so external
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 scoped_ptr<ContentDecryptorDelegate> content_decryptor_delegate_; 786 scoped_ptr<ContentDecryptorDelegate> content_decryptor_delegate_;
786 787
787 friend class PpapiPluginInstanceTest; 788 friend class PpapiPluginInstanceTest;
788 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 789 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
789 }; 790 };
790 791
791 } // namespace ppapi 792 } // namespace ppapi
792 } // namespace webkit 793 } // namespace webkit
793 794
794 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 795 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698