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

Unified Diff: ui/compositor/compositor.h

Issue 10689108: Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer comments, remove dead code, plumb through context. Created 8 years, 5 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
Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 735954f4df030e9e21527205a25b4d08a0a7b966..2b24d60e2b4d4803516e164aa094cc57722344cc 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -6,6 +6,9 @@
#define UI_COMPOSITOR_COMPOSITOR_H_
#pragma once
+#include <vector>
+
+#include "base/callback.h"
#include "base/hash_tables.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
@@ -102,6 +105,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;
piman 2012/07/12 00:18:09 nit: chrome style.
jonathan.backer 2012/07/12 13:53:22 Done.
protected:
virtual ~Texture();
@@ -210,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();
@@ -217,6 +222,9 @@ class COMPOSITOR_EXPORT Compositor
int last_started_frame() { return last_started_frame_; }
int last_ended_frame() { return last_ended_frame_; }
+ void AddDidCommitCallback(
+ const base::Callback<void(ui::Compositor*)>& callback);
+
private:
friend class base::RefCounted<Compositor>;
@@ -252,6 +260,9 @@ class COMPOSITOR_EXPORT Compositor
int last_ended_frame_;
bool disable_schedule_composite_;
+
+ std::vector< base::Callback<void(ui::Compositor*)> >
+ did_commit_callbacks_;
};
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698