From 8ba593f708c15ff3a9e0fce6a8bb8da1f80dec3b Mon Sep 17 00:00:00 2001 From: jbauman Date: Tue, 1 Sep 2015 14:20:23 -0700 Subject: Revert of cc: Move worker context BindToCurrentThread/SetupLock calls out of cc::OutputSurface. (patchset #5 id:80001 of https://codereview.chromium.org/1317743002/ ) Reason for revert: Likely causes crash on Mac: https://build.chromium.org/p/chromium.gpu/builders/Mac%20Release%20%28Intel%29/builds/54667 Going to see if reverting helps. BUG=527186 Original issue's description: > cc: Move worker context BindToCurrentThread/SetupLock calls out of cc::OutputSurface. > > This moves the responsibility to call these functions from > cc:OutputSurface to the code that creates the context. > > BUG=523411 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/10b73d7c140bc67ddeeaf716eb31df0977fe2497 > Cr-Commit-Position: refs/heads/master@{#346712} TBR=avi@chromium.org,danakj@chromium.org,reveman@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=523411 Review URL: https://codereview.chromium.org/1317533003 Cr-Commit-Position: refs/heads/master@{#346736} --- cc/raster/tile_task_worker_pool_unittest.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cc/raster') diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc index 73f22df..da411f6 100644 --- a/cc/raster/tile_task_worker_pool_unittest.cc +++ b/cc/raster/tile_task_worker_pool_unittest.cc @@ -133,10 +133,9 @@ class TileTaskWorkerPoolTest TileTaskWorkerPoolTest() : context_provider_(TestContextProvider::Create()), - worker_context_provider_(TestContextProvider::CreateWorker()), + worker_context_provider_(TestContextProvider::Create()), all_tile_tasks_finished_( - base::ThreadTaskRunnerHandle::Get() - .get(), + base::ThreadTaskRunnerHandle::Get().get(), base::Bind(&TileTaskWorkerPoolTest::AllTileTasksFinished, base::Unretained(this))), timeout_seconds_(5), -- cgit v1.1