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

Unified Diff: cc/test/fake_output_surface.h

Issue 14772021: cc::OutputSurfaceClient::InitializeForGL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add swap callback dcheck, fix test Created 7 years, 6 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: cc/test/fake_output_surface.h
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index 090571f6a91231728c96150a02e7bbc16a380856..fc72203ec994199c23433da060c70abe9a924602 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -58,9 +58,10 @@ class FakeOutputSurface : public OutputSurface {
}
static scoped_ptr<FakeOutputSurface> CreateDeferredGL(
+ scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
scoped_ptr<SoftwareOutputDevice> software_device) {
scoped_ptr<FakeOutputSurface> result(
- new FakeOutputSurface(software_device.Pass(), false));
+ new FakeOutputSurface(context3d.Pass(), software_device.Pass(), false));
result->capabilities_.deferred_gl_initialization = true;
return result.Pass();
}
@@ -90,6 +91,11 @@ class FakeOutputSurface : public OutputSurface {
scoped_ptr<SoftwareOutputDevice> software_device,
bool has_parent);
+ FakeOutputSurface(
+ scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
+ scoped_ptr<SoftwareOutputDevice> software_device,
+ bool has_parent);
+
void SendFrameAck();
CompositorFrame last_sent_frame_;

Powered by Google App Engine
This is Rietveld 408576698