Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1084)

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 2087333002: mus::GpuService: Support establish GpuChannel asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 #if defined(ENABLE_WEBRTC) 227 #if defined(ENABLE_WEBRTC)
228 #include "content/browser/media/webrtc/webrtc_internals.h" 228 #include "content/browser/media/webrtc/webrtc_internals.h"
229 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h" 229 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h"
230 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h" 230 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h"
231 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" 231 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
232 #include "content/common/media/aec_dump_messages.h" 232 #include "content/common/media/aec_dump_messages.h"
233 #include "content/common/media/media_stream_messages.h" 233 #include "content/common/media/media_stream_messages.h"
234 #endif 234 #endif
235 235
236 #if defined(MOJO_RUNNER_CLIENT) 236 #if defined(MOJO_SHELL_CLIENT)
237 #include "components/mus/common/switches.h" 237 #include "components/mus/common/switches.h"
238 #endif 238 #endif
239 239
240 #if defined(OS_WIN) 240 #if defined(OS_WIN)
241 #define IntToStringType base::IntToString16 241 #define IntToStringType base::IntToString16
242 #else 242 #else
243 #define IntToStringType base::IntToString 243 #define IntToStringType base::IntToString
244 #endif 244 #endif
245 245
246 namespace content { 246 namespace content {
(...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 switches::kEnableWin7WebRtcHWH264Decoding, 1528 switches::kEnableWin7WebRtcHWH264Decoding,
1529 switches::kTrySupportedChannelLayouts, 1529 switches::kTrySupportedChannelLayouts,
1530 switches::kTraceExportEventsToETW, 1530 switches::kTraceExportEventsToETW,
1531 #endif 1531 #endif
1532 #if defined(USE_OZONE) 1532 #if defined(USE_OZONE)
1533 switches::kOzonePlatform, 1533 switches::kOzonePlatform,
1534 #endif 1534 #endif
1535 #if defined(OS_CHROMEOS) 1535 #if defined(OS_CHROMEOS)
1536 switches::kDisableVaapiAcceleratedVideoEncode, 1536 switches::kDisableVaapiAcceleratedVideoEncode,
1537 #endif 1537 #endif
1538 #if defined(MOJO_SHELL_CLIENT)
1539 switches::kUseMusInRenderer,
1540 #endif
1541 #if defined(ENABLE_IPC_FUZZER) 1538 #if defined(ENABLE_IPC_FUZZER)
1542 switches::kIpcDumpDirectory, 1539 switches::kIpcDumpDirectory,
1543 switches::kIpcFuzzerTestcase, 1540 switches::kIpcFuzzerTestcase,
1544 #endif 1541 #endif
1545 #if defined(MOJO_RUNNER_CLIENT) 1542 #if defined(MOJO_SHELL_CLIENT)
1543 switches::kUseMusInRenderer,
1546 mus::switches::kUseChromeGpuCommandBufferInMus, 1544 mus::switches::kUseChromeGpuCommandBufferInMus,
1547 #endif 1545 #endif
1548 }; 1546 };
1549 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1547 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1550 arraysize(kSwitchNames)); 1548 arraysize(kSwitchNames));
1551 1549
1552 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); 1550 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd);
1553 1551
1554 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1552 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1555 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { 1553 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
(...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after
2814 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 2812 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
2815 2813
2816 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias 2814 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias
2817 // enough information here so that we can determine what the bad message was. 2815 // enough information here so that we can determine what the bad message was.
2818 base::debug::Alias(&error); 2816 base::debug::Alias(&error);
2819 bad_message::ReceivedBadMessage(process.get(), 2817 bad_message::ReceivedBadMessage(process.get(),
2820 bad_message::RPH_MOJO_PROCESS_ERROR); 2818 bad_message::RPH_MOJO_PROCESS_ERROR);
2821 } 2819 }
2822 2820
2823 } // namespace content 2821 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698