summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_main.cc
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2016-02-24 11:15:40 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-24 19:16:51 +0000
commit6904b50eb105956b954279f9632f680251e41aa7 (patch)
tree6a39052f74fcf51d0f09d7b500cdab8ee4d072f6 /content/gpu/gpu_main.cc
parent31d944d5d63830330f376e946b08e08347e4c22b (diff)
downloadchromium_src-6904b50eb105956b954279f9632f680251e41aa7.zip
chromium_src-6904b50eb105956b954279f9632f680251e41aa7.tar.gz
chromium_src-6904b50eb105956b954279f9632f680251e41aa7.tar.bz2
Decouple browser-specific GPU IPC messages from GPU service IPCs
We would like Mus to reuse GPU service IPC messages. However, browser-specific<=>gpu messages don't necessarily make sense in Mus+Ash. This CL decouples browser messages from Gpu channel messages in the following ways: 1. Browser channel messages are moved to a gpu_host_messages.h file. 2. Browser channel message handling is moved entirely to GpuChildThread. 3. GpuChannelManager is decoupled from GpuChildThread by making GpuChildThread a GpuChannelManagerDelegate. The intent here is for Mus to implement an alternative GpuChannelManagerDelegate. BUG=586374 Review URL: https://codereview.chromium.org/1711533002 Cr-Commit-Position: refs/heads/master@{#377341}
Diffstat (limited to 'content/gpu/gpu_main.cc')
-rw-r--r--content/gpu/gpu_main.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 7ce05a0..958e40d 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -21,8 +21,8 @@
#include "content/child/child_process.h"
#include "content/common/content_constants_internal.h"
#include "content/common/gpu/gpu_config.h"
+#include "content/common/gpu/gpu_host_messages.h"
#include "content/common/gpu/gpu_memory_buffer_factory.h"
-#include "content/common/gpu/gpu_messages.h"
#include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"
#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
@@ -121,8 +121,8 @@ bool GpuProcessLogMessageHandler(int severity,
const std::string& str) {
std::string header = str.substr(0, message_start);
std::string message = str.substr(message_start);
- deferred_messages.Get().push(new GpuHostMsg_OnLogMessage(
- severity, header, message));
+ deferred_messages.Get().push(
+ new GpuHostMsg_OnLogMessage(severity, header, message));
return false;
}