summaryrefslogtreecommitdiffstats
path: root/content/common/gpu
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2016-03-22 16:05:02 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 23:07:06 +0000
commitc28d985e1f60cece099c984f1e1f8cd0c33c0e14 (patch)
tree49c20dd7da0304053e01313fbf6cd8bda9f022d0 /content/common/gpu
parent8850e78f71baede764a2269fa6ec40b3ecca7465 (diff)
downloadchromium_src-c28d985e1f60cece099c984f1e1f8cd0c33c0e14.zip
chromium_src-c28d985e1f60cece099c984f1e1f8cd0c33c0e14.tar.gz
chromium_src-c28d985e1f60cece099c984f1e1f8cd0c33c0e14.tar.bz2
gpu_process_launch_causes => content/common
This is used to establish the channel and has content-speciifc concepts. This doesn't seem to belong to content/common/gpu as per piman@'s suggestion. BUG=596290 CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel Review URL: https://codereview.chromium.org/1825183002 Cr-Commit-Position: refs/heads/master@{#382724}
Diffstat (limited to 'content/common/gpu')
-rw-r--r--content/common/gpu/client/gpu_channel_host.h1
-rw-r--r--content/common/gpu/gpu_process_launch_causes.h35
2 files changed, 0 insertions, 36 deletions
diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h
index 4d6716f..ab879de 100644
--- a/content/common/gpu/client/gpu_channel_host.h
+++ b/content/common/gpu/client/gpu_channel_host.h
@@ -20,7 +20,6 @@
#include "base/process/process.h"
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
-#include "content/common/gpu/gpu_process_launch_causes.h"
#include "gpu/config/gpu_info.h"
#include "gpu/ipc/common/gpu_stream_constants.h"
#include "gpu/ipc/common/surface_handle.h"
diff --git a/content/common/gpu/gpu_process_launch_causes.h b/content/common/gpu/gpu_process_launch_causes.h
deleted file mode 100644
index 1fcdc27..0000000
--- a/content/common/gpu/gpu_process_launch_causes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_COMMON_GPU_GPU_PROCESS_LAUNCH_CAUSES_H_
-#define CONTENT_COMMON_GPU_GPU_PROCESS_LAUNCH_CAUSES_H_
-
-namespace content {
-
-// If you change this enum you also need to update
-// tools/metrics/histograms/histograms.xml
-enum CauseForGpuLaunch {
- // Start enum from 2 to keep the same values for the histogram.
- CAUSE_FOR_GPU_LAUNCH_GPUDATAMANAGER_REQUESTCOMPLETEGPUINFOIFNEEDED = 2,
- CAUSE_FOR_GPU_LAUNCH_RENDERWIDGETFULLSCREENPEPPER_CREATECONTEXT,
- CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE,
- CAUSE_FOR_GPU_LAUNCH_NO_LAUNCH,
- CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE,
- CAUSE_FOR_GPU_LAUNCH_PEPPERPLATFORMCONTEXT3DIMPL_INITIALIZE,
- CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP,
- CAUSE_FOR_GPU_LAUNCH_CANVAS_2D,
- CAUSE_FOR_GPU_LAUNCH_PEPPERVIDEOENCODERACCELERATOR_INITIALIZE,
- CAUSE_FOR_GPU_LAUNCH_GPU_MEMORY_BUFFER_ALLOCATE,
- CAUSE_FOR_GPU_LAUNCH_JPEGDECODEACCELERATOR_INITIALIZE,
- CAUSE_FOR_GPU_LAUNCH_MOJO_SETUP,
- CAUSE_FOR_GPU_LAUNCH_GET_GPU_SERVICE_REGISTRY,
-
- // All new values should be inserted above this point so that
- // existing values continue to match up with those in histograms.xml.
- CAUSE_FOR_GPU_LAUNCH_MAX_ENUM
-};
-
-} // namespace content
-
-#endif // CONTENT_COMMON_GPU_GPU_PROCESS_LAUNCH_CAUSES_H_