From 66b36fff67a845406d7a2addd0a5f5cd729cb0df Mon Sep 17 00:00:00 2001 From: caseq Date: Tue, 10 Feb 2015 05:54:50 -0800 Subject: 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} --- cc/surfaces/surface_display_output_surface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cc/surfaces') 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& context_provider) - : OutputSurface(context_provider), + : OutputSurface(context_provider, nullptr), display_client_(NULL), surface_manager_(surface_manager), factory_(surface_manager, this), -- cgit v1.1