diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 09:03:27 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 09:03:27 +0000 |
| commit | 2b154b2a2a4c2adf2d145cddbae49767acc67633 (patch) | |
| tree | 2966cd155581d9786b1ea892dcd438696b1ef2c7 /cc/test/fake_output_surface.h | |
| parent | 8d0e6fe215548a3c19a569d300cc0f01e2e1f2ac (diff) | |
| download | chromium_src-2b154b2a2a4c2adf2d145cddbae49767acc67633.zip chromium_src-2b154b2a2a4c2adf2d145cddbae49767acc67633.tar.gz chromium_src-2b154b2a2a4c2adf2d145cddbae49767acc67633.tar.bz2 | |
cc::OutputSurfaceClient::DeferredInitialize
SynchronousCompositorOutputSurface first starts in software only
mode, then cc::OutputSurfaceClient::InitializeForGL is called to
initialize the GL parts.
BUG=230197
Review URL: https://chromiumcodereview.appspot.com/14772021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_output_surface.h')
| -rw-r--r-- | cc/test/fake_output_surface.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h index 6eff484..7460f93 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_; |