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/gpu | |
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/gpu')
-rw-r--r-- | content/browser/gpu/compositor_util.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index 9646b8f..342aafb 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc @@ -242,6 +242,14 @@ bool IsOneCopyUploadEnabled() { bool IsZeroCopyUploadEnabled() { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); + // Single-threaded mode in the renderer process (for layout tests) is + // synchronous, which depends on tiles being ready to draw when raster is + // complete. Therefore, it must use one of zero copy, software raster, or + // GPU raster. So we force zero-copy on for the case where software/GPU raster + // is not used. + // TODO(reveman): One-copy can work with sync compositing: crbug.com/490295. + if (command_line.HasSwitch(switches::kDisableThreadedCompositing)) + return true; return command_line.HasSwitch(switches::kEnableZeroCopy); } |