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

Unified Diff: cc/test/fake_output_surface.h

Issue 11464007: Add the DelegatingRenderer class with its initialize path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: initialize() Created 8 years 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: cc/test/fake_output_surface.h
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index 1150b05b0619bb11f1737f79586db405a468058e..f21e0580f628ddbb238d6416e6459a6d3e2d2280 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -20,12 +20,24 @@ class FakeOutputSurface : public OutputSurface {
static inline scoped_ptr<FakeOutputSurface> Create3d(
scoped_ptr<WebKit::WebGraphicsContext3D> context3d) {
- return make_scoped_ptr(new FakeOutputSurface(context3d.Pass()));
+ return make_scoped_ptr(new FakeOutputSurface(context3d.Pass(), false));
}
static inline scoped_ptr<FakeOutputSurface> CreateSoftware(
scoped_ptr<SoftwareOutputDevice> software_device) {
- return make_scoped_ptr(new FakeOutputSurface(software_device.Pass()));
+ return make_scoped_ptr(
+ new FakeOutputSurface(software_device.Pass(), false));
+ }
+
+ static inline scoped_ptr<FakeOutputSurface> CreateDelegating3d(
+ scoped_ptr<WebKit::WebGraphicsContext3D> context3d) {
+ return make_scoped_ptr(new FakeOutputSurface(context3d.Pass(), true));
+ }
+
+ static inline scoped_ptr<FakeOutputSurface> CreateDelegatingSoftware(
+ scoped_ptr<SoftwareOutputDevice> software_device) {
+ return make_scoped_ptr(
+ new FakeOutputSurface(software_device.Pass(), true));
}
virtual bool BindToClient(OutputSurfaceClient* client) OVERRIDE;
@@ -39,9 +51,9 @@ class FakeOutputSurface : public OutputSurface {
private:
explicit FakeOutputSurface(
- scoped_ptr<WebKit::WebGraphicsContext3D> context3d);
+ scoped_ptr<WebKit::WebGraphicsContext3D> context3d, bool has_parent);
explicit FakeOutputSurface(
- scoped_ptr<SoftwareOutputDevice> software_device);
+ scoped_ptr<SoftwareOutputDevice> software_device, bool has_parent);
scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
scoped_ptr<SoftwareOutputDevice> software_device_;

Powered by Google App Engine
This is Rietveld 408576698