diff options
| author | sky <sky@chromium.org> | 2015-08-18 14:46:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 21:46:45 +0000 |
| commit | c4967eface72bc99452d8a83800c7cdd19a872ee (patch) | |
| tree | 82ec25a98e098ab4e18afa46afd7cbdc2f984fe6 /mojo | |
| parent | 70e489415d055feba858a975443eee2f62e0e88e (diff) | |
| download | chromium_src-c4967eface72bc99452d8a83800c7cdd19a872ee.zip chromium_src-c4967eface72bc99452d8a83800c7cdd19a872ee.tar.gz chromium_src-c4967eface72bc99452d8a83800c7cdd19a872ee.tar.bz2 | |
Revert of Re-land: cc: Use worker context for one-copy tile initialization. (patchset #29 id:560001 of https://codereview.chromium.org/1230203007/ )
Reason for revert:
Sorry Dave. I'm reverting as this broke mandoline. To see the breakage build mandoline:all, and run with:
mandoline --oopif-always-create-new-frame-tree http://phuang.github.io/iframe.html .
We do have mandoline tests that run, but they run with the code path gfx::GLSurfaceTestSupport::InitializeOneOff(), which is why they likely still pass. I'll see about making the tests not run with that config.
Original issue's description:
> Re-land: cc: Use worker context for one-copy tile initialization.
>
> This moves management of staging resources to
> OneCopyTileTaskWorkerPool class. This makes it possible
> to use a worker context to issue and detect when copy
> operations complete.
>
> BUG=490295
> TBR=jamesr@chromium.org, sky@chromium.org
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/af0ab609b53c64ce43172be42e20e7ca8beab497
> Cr-Commit-Position: refs/heads/master@{#343947}
TBR=jamesr@chromium.org,kbr@chromium.org,piman@chromium.org,primiano@chromium.org,vmiura@chromium.org,vmpstr@chromium.org,reveman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=490295
Review URL: https://codereview.chromium.org/1298143003
Cr-Commit-Position: refs/heads/master@{#344042}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/cc/output_surface_mojo.cc | 3 | ||||
| -rw-r--r-- | mojo/cc/output_surface_mojo.h | 8 | ||||
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.cc | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/mojo/cc/output_surface_mojo.cc b/mojo/cc/output_surface_mojo.cc index 76f5b49..21f509f 100644 --- a/mojo/cc/output_surface_mojo.cc +++ b/mojo/cc/output_surface_mojo.cc @@ -15,9 +15,8 @@ namespace mojo { OutputSurfaceMojo::OutputSurfaceMojo( OutputSurfaceMojoClient* client, const scoped_refptr<cc::ContextProvider>& context_provider, - const scoped_refptr<cc::ContextProvider>& worker_context_provider, ScopedMessagePipeHandle surface_handle) - : cc::OutputSurface(context_provider, worker_context_provider), + : cc::OutputSurface(context_provider), output_surface_mojo_client_(client), surface_handle_(surface_handle.Pass()), id_namespace_(0u), diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h index 82df5b8..e8f8737 100644 --- a/mojo/cc/output_surface_mojo.h +++ b/mojo/cc/output_surface_mojo.h @@ -21,11 +21,9 @@ class OutputSurfaceMojoClient { class OutputSurfaceMojo : public cc::OutputSurface { public: - OutputSurfaceMojo( - OutputSurfaceMojoClient* client, - const scoped_refptr<cc::ContextProvider>& context_provider, - const scoped_refptr<cc::ContextProvider>& worker_context_provider, - ScopedMessagePipeHandle surface_handle); + OutputSurfaceMojo(OutputSurfaceMojoClient* client, + const scoped_refptr<cc::ContextProvider>& context_provider, + ScopedMessagePipeHandle surface_handle); // cc::OutputSurface implementation. void SwapBuffers(cc::CompositorFrame* frame) override; diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index 0aec3a9..a61befb 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -825,8 +825,7 @@ void MojoGLES2Impl::ShallowFlushCHROMIUM() { glShallowFlushCHROMIUM(); } void MojoGLES2Impl::OrderingBarrierCHROMIUM() { - MojoGLES2MakeCurrent(context_); - glOrderingBarrierCHROMIUM(); + NOTREACHED() << "Unimplemented OrderingBarrierCHROMIUM."; } void MojoGLES2Impl::StencilFunc(GLenum func, GLint ref, GLuint mask) { MojoGLES2MakeCurrent(context_); |