Index: ui/compositor/compositor.h |
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h |
index 0b129cfb41213f2cf266d2cfd468d06d151358a4..ea5772480c321aaa0cc6146331827bcf56d675cf 100644 |
--- a/ui/compositor/compositor.h |
+++ b/ui/compositor/compositor.h |
@@ -101,6 +101,7 @@ class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> { |
void set_texture_id(unsigned int id) { texture_id_ = id; } |
bool flipped() const { return flipped_; } |
gfx::Size size() const { return size_; } |
+ virtual WebKit::WebGraphicsContext3D* HostContext3D() = 0; |
protected: |
virtual ~Texture(); |
@@ -190,6 +191,10 @@ class COMPOSITOR_EXPORT Compositor |
// and the OnCompositingEnded. |
bool DrawPending() const { return swap_posted_; } |
+ // Returns whether the drawing is issued from a separate thread |
+ // (i.e. |Compositor::Initialize(true)| was called). |
+ bool IsThreaded() const; |
+ |
// Internal functions, called back by command-buffer contexts on swap buffer |
// events. |
@@ -209,6 +214,7 @@ class COMPOSITOR_EXPORT Compositor |
float scaleFactor); |
virtual WebKit::WebGraphicsContext3D* createContext3D(); |
virtual void didRebindGraphicsContext(bool success); |
+ virtual void didCommit(); |
virtual void didCommitAndDrawFrame(); |
virtual void didCompleteSwapBuffers(); |
virtual void scheduleComposite(); |
@@ -251,6 +257,8 @@ class COMPOSITOR_EXPORT Compositor |
int last_ended_frame_; |
bool disable_schedule_composite_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(Compositor); |
}; |
} // namespace ui |