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 /content/browser/compositor/offscreen_browser_compositor_output_surface.cc | |
| 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 'content/browser/compositor/offscreen_browser_compositor_output_surface.cc')
| -rw-r--r-- | content/browser/compositor/offscreen_browser_compositor_output_surface.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/browser/compositor/offscreen_browser_compositor_output_surface.cc b/content/browser/compositor/offscreen_browser_compositor_output_surface.cc index da972c7..599f553 100644 --- a/content/browser/compositor/offscreen_browser_compositor_output_surface.cc +++ b/content/browser/compositor/offscreen_browser_compositor_output_surface.cc @@ -30,12 +30,10 @@ namespace content { OffscreenBrowserCompositorOutputSurface:: OffscreenBrowserCompositorOutputSurface( const scoped_refptr<ContextProviderCommandBuffer>& context, - const scoped_refptr<ContextProviderCommandBuffer>& worker_context, const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, scoped_ptr<BrowserCompositorOverlayCandidateValidator> overlay_candidate_validator) : BrowserCompositorOutputSurface(context, - worker_context, vsync_manager, overlay_candidate_validator.Pass()), fbo_(0), |