diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 03:23:05 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 03:23:05 +0000 |
| commit | 4c0e3d72a5ccdc72aace7e29f3d7458eaf5b7224 (patch) | |
| tree | 76ad09e5752e9e0fcb1d6759b33af281b5d6502a /webkit/compositor_bindings | |
| parent | aa19e1206a6f005b719b3548aabd35126f361835 (diff) | |
| download | chromium_src-4c0e3d72a5ccdc72aace7e29f3d7458eaf5b7224.zip chromium_src-4c0e3d72a5ccdc72aace7e29f3d7458eaf5b7224.tar.gz chromium_src-4c0e3d72a5ccdc72aace7e29f3d7458eaf5b7224.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings')
| -rw-r--r-- | webkit/compositor_bindings/web_compositor_support_output_surface.cc | 2 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_compositor_support_output_surface.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/compositor_bindings/web_compositor_support_output_surface.cc b/webkit/compositor_bindings/web_compositor_support_output_surface.cc index 12bbe9b..03d49f1 100644 --- a/webkit/compositor_bindings/web_compositor_support_output_surface.cc +++ b/webkit/compositor_bindings/web_compositor_support_output_surface.cc @@ -41,7 +41,7 @@ cc::SoftwareOutputDevice* WebCompositorSupportOutputSurface::SoftwareDevice() co } void WebCompositorSupportOutputSurface::SendFrameToParentCompositor( - const cc::CompositorFrame&) { + cc::CompositorFrame*) { // No support for delegated renderers in DumpRenderTree. NOTREACHED(); } diff --git a/webkit/compositor_bindings/web_compositor_support_output_surface.h b/webkit/compositor_bindings/web_compositor_support_output_surface.h index 7f81fe4..c1bd598 100644 --- a/webkit/compositor_bindings/web_compositor_support_output_surface.h +++ b/webkit/compositor_bindings/web_compositor_support_output_surface.h @@ -36,7 +36,7 @@ class WebCompositorSupportOutputSurface : public cc::OutputSurface { virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE; virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE; - virtual void SendFrameToParentCompositor(const cc::CompositorFrame&) OVERRIDE; + virtual void SendFrameToParentCompositor(cc::CompositorFrame*) OVERRIDE; private: WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( |