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.h | |
| 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.h')
| -rw-r--r-- | cc/test/fake_output_surface.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h index 0cfb41f..d843cca 100644 --- a/cc/test/fake_output_surface.h +++ b/cc/test/fake_output_surface.h @@ -7,7 +7,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "cc/compositor_frame.h" #include "cc/output_surface.h" #include "cc/test/fake_software_output_device.h" #include "cc/test/fake_web_graphics_context_3d.h" @@ -48,10 +47,7 @@ class FakeOutputSurface : public OutputSurface { virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE; virtual SoftwareOutputDevice* SoftwareDevice() const OVERRIDE; - virtual void SendFrameToParentCompositor(CompositorFrame*) OVERRIDE; - - CompositorFrame& last_sent_frame() { return last_sent_frame_; } - size_t num_sent_frames() { return num_sent_frames_; } + virtual void SendFrameToParentCompositor(const CompositorFrame&) OVERRIDE; private: explicit FakeOutputSurface( @@ -63,8 +59,6 @@ private: scoped_ptr<SoftwareOutputDevice> software_device_; struct Capabilities capabilities_; OutputSurfaceClient* client_; - CompositorFrame last_sent_frame_; - size_t num_sent_frames_; }; static inline scoped_ptr<cc::OutputSurface> createFakeOutputSurface() |