summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorkbr <kbr@chromium.org>2015-08-06 21:32:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-07 04:33:38 +0000
commit78fd0255093c56d92b4281b7e3095a92a3f3d4ed (patch)
tree3b8864c3dc3a0cb18e4f4b10f5f67b316f801145 /gpu
parent77c475e92057174e499223f350c31986a5f49d32 (diff)
downloadchromium_src-78fd0255093c56d92b4281b7e3095a92a3f3d4ed.zip
chromium_src-78fd0255093c56d92b4281b7e3095a92a3f3d4ed.tar.gz
chromium_src-78fd0255093c56d92b4281b7e3095a92a3f3d4ed.tar.bz2
Revert of cc: Use worker context for one-copy tile initialization. (patchset #20 id:380001 of https://codereview.chromium.org/1230203007/ )
Reason for revert: Suspected of colliding with another patch and causing Issue 517719. Original issue's description: > 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 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/d5157ac5afec145b85746b42f2d86383483a8222 > Cr-Commit-Position: refs/heads/master@{#342235} TBR=piman@chromium.org,primiano@chromium.org,vmiura@chromium.org,vmpstr@chromium.org,reveman@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=490295,517719 Review URL: https://codereview.chromium.org/1273163004 Cr-Commit-Position: refs/heads/master@{#342284}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/query_manager.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
index a269f35..49f111f 100644
--- a/gpu/command_buffer/service/query_manager.cc
+++ b/gpu/command_buffer/service/query_manager.cc
@@ -785,7 +785,6 @@ QueryManager::~QueryManager() {
}
void QueryManager::Destroy(bool have_context) {
- active_queries_.clear();
pending_queries_.clear();
pending_transfer_queries_.clear();
active_queries_.clear();