diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 03:38:54 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 03:38:54 +0000 |
| commit | f85c4971bbe51c4bbfe58bc74ec9f83b3b437d0d (patch) | |
| tree | 827eff4cc19bc3963a7c2ff8f7b3e8500c019053 /cc/test/fake_output_surface.cc | |
| parent | a49fb9bf90643ad5c1b4f91385f8f978235949ce (diff) | |
| download | chromium_src-f85c4971bbe51c4bbfe58bc74ec9f83b3b437d0d.zip chromium_src-f85c4971bbe51c4bbfe58bc74ec9f83b3b437d0d.tar.gz chromium_src-f85c4971bbe51c4bbfe58bc74ec9f83b3b437d0d.tar.bz2 | |
Revert 175690
> cc: Implement DelegatingRender::drawFrame() method.
>
> The method sends the render passes it is given to the parent compositor via
> the output surface. It should include a valid frame metadata with it.
>
> Tests:
> DelegatingRendererTestDraw.runSingleThread
> DelegatingRendererTestDraw.runMultiThread
> DelegatingRendererTestResources.runSingleThread
> DelegatingRendererTestResources.runMultiThread
>
> R=piman
> BUG=123444
>
> Review URL: https://chromiumcodereview.appspot.com/11777025
TBR=danakj@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_output_surface.cc')
| -rw-r--r-- | cc/test/fake_output_surface.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc index ebbe783..a312041 100644 --- a/cc/test/fake_output_surface.cc +++ b/cc/test/fake_output_surface.cc @@ -7,15 +7,13 @@ namespace cc { FakeOutputSurface::FakeOutputSurface( - scoped_ptr<WebKit::WebGraphicsContext3D> context3d, bool has_parent) - : num_sent_frames_(0) { + scoped_ptr<WebKit::WebGraphicsContext3D> context3d, bool has_parent) { context3d_ = context3d.Pass(); capabilities_.has_parent_compositor = has_parent; } FakeOutputSurface::FakeOutputSurface( - scoped_ptr<SoftwareOutputDevice> software_device, bool has_parent) - : num_sent_frames_(0) { + scoped_ptr<SoftwareOutputDevice> software_device, bool has_parent) { software_device_ = software_device.Pass(); capabilities_.has_parent_compositor = has_parent; } @@ -45,10 +43,6 @@ SoftwareOutputDevice* FakeOutputSurface::SoftwareDevice() const { return software_device_.get(); } -void FakeOutputSurface::SendFrameToParentCompositor( - CompositorFrame* frame) { - frame->AssignTo(&last_sent_frame_); - ++num_sent_frames_; -} +void FakeOutputSurface::SendFrameToParentCompositor(const CompositorFrame&) {} } // namespace cc |