diff options
| author | caseq <caseq@chromium.org> | 2015-02-10 05:54:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 13:55:26 +0000 |
| commit | 66b36fff67a845406d7a2addd0a5f5cd729cb0df (patch) | |
| tree | 15f63f7066b162a91a6203980f6cbb22d748ed09 /cc/surfaces | |
| parent | 4d8bc880099c59c28e0931c713db2ca7c0d6f788 (diff) | |
| download | chromium_src-66b36fff67a845406d7a2addd0a5f5cd729cb0df.zip chromium_src-66b36fff67a845406d7a2addd0a5f5cd729cb0df.tar.gz chromium_src-66b36fff67a845406d7a2addd0a5f5cd729cb0df.tar.bz2 | |
Revert of Allow creating context for cc worker thread. (patchset #5 id:80001 of https://codereview.chromium.org/898453007/)
Reason for revert:
Broke libcontent.dylib build on mac debug builder: http://build.chromium.org/p/chromium.webkit/builders/Mac%20Builder%20%28dbg%29/builds/74405/steps/compile/logs/stdio
Original issue's description:
> Allow creating context for cc worker thread.
>
> An additional context can be provided by the OutputSurface. This will be used for cc/ to create a context on its worker thread.
>
> Committed: https://crrev.com/3702467b0a7c261bdf8700597c76e51dc39a449c
> Cr-Commit-Position: refs/heads/master@{#315469}
TBR=piman@chromium.org,jbauman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/915523003
Cr-Commit-Position: refs/heads/master@{#315552}
Diffstat (limited to 'cc/surfaces')
| -rw-r--r-- | cc/surfaces/surface_display_output_surface.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc index b99e2b4..068fe03 100644 --- a/cc/surfaces/surface_display_output_surface.cc +++ b/cc/surfaces/surface_display_output_surface.cc @@ -17,7 +17,7 @@ SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( SurfaceManager* surface_manager, SurfaceIdAllocator* allocator, const scoped_refptr<ContextProvider>& context_provider) - : OutputSurface(context_provider), + : OutputSurface(context_provider, nullptr), display_client_(NULL), surface_manager_(surface_manager), factory_(surface_manager, this), |