Index: webkit/plugins/ppapi/plugin_delegate.h |
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h |
index acbba067eda4cd4cd7f19df67146e8bd0bdb4085..3de2d165eea88297b869045956976abb3686f4e1 100644 |
--- a/webkit/plugins/ppapi/plugin_delegate.h |
+++ b/webkit/plugins/ppapi/plugin_delegate.h |
@@ -16,6 +16,7 @@ |
#include "base/shared_memory.h" |
#include "base/sync_socket.h" |
#include "base/time.h" |
+#include "cc/resources/texture_mailbox.h" |
#include "googleurl/src/gurl.h" |
#include "ipc/ipc_platform_file.h" |
#include "media/video/capture/video_capture.h" |
@@ -63,6 +64,7 @@ class Point; |
namespace gpu { |
class CommandBuffer; |
+struct Mailbox; |
} |
namespace ppapi { |
@@ -219,12 +221,10 @@ class PluginDelegate { |
virtual bool Init(const int32* attrib_list, |
PlatformContext3D* share_context) = 0; |
- // If the plugin instance is backed by an OpenGL, return its ID in the |
- // compositors namespace. Otherwise return 0. Returns 0 by default. |
- virtual unsigned GetBackingTextureId() = 0; |
- |
- // Returns the parent context that allocated the backing texture ID. |
- virtual WebKit::WebGraphicsContext3D* GetParentContext() = 0; |
+ // If the plugin instance is backed by an OpenGL texture, retrieves the |
+ // mailbox identifier and sync_point, and return true. Otherwise return |
danakj
2013/06/05 14:13:33
Where's the sync point that this comment speaks of
piman
2013/06/05 17:57:55
Sorry, copy & paste from the future. Fixed.
|
+ // false. |
+ virtual void GetBackingMailbox(::gpu::Mailbox* mailbox) = 0; |
// Returns true if the backing texture is always opaque. |
virtual bool IsOpaque() = 0; |
@@ -412,9 +412,6 @@ class PluginDelegate { |
// The caller will own the pointer returned from this. |
virtual PlatformContext3D* CreateContext3D() = 0; |
- // Set that the context will now present to the delegate. |
- virtual void ReparentContext(PlatformContext3D*) = 0; |
- |
// If |device_id| is empty, the default video capture device will be used. The |
// user can start using the returned object to capture video right away. |
// Otherwise, the specified device will be used. The user needs to wait till |