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

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

Issue 2176303002: services/ui: Remove deprecated gpu code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 #endif 228 #endif
229 229
230 #if defined(ENABLE_WEBRTC) 230 #if defined(ENABLE_WEBRTC)
231 #include "content/browser/media/webrtc/webrtc_internals.h" 231 #include "content/browser/media/webrtc/webrtc_internals.h"
232 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h" 232 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h"
233 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" 233 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
234 #include "content/common/media/aec_dump_messages.h" 234 #include "content/common/media/aec_dump_messages.h"
235 #include "content/common/media/media_stream_messages.h" 235 #include "content/common/media/media_stream_messages.h"
236 #endif 236 #endif
237 237
238 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
239 #include "services/ui/common/switches.h" // nogncheck
240 #endif
241
242 #if defined(USE_MINIKIN_HYPHENATION) 238 #if defined(USE_MINIKIN_HYPHENATION)
243 #include "content/browser/hyphenation/hyphenation_impl.h" 239 #include "content/browser/hyphenation/hyphenation_impl.h"
244 #endif 240 #endif
245 241
246 #if defined(OS_WIN) 242 #if defined(OS_WIN)
247 #define IntToStringType base::IntToString16 243 #define IntToStringType base::IntToString16
248 #else 244 #else
249 #define IntToStringType base::IntToString 245 #define IntToStringType base::IntToString
250 #endif 246 #endif
251 247
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
1597 #endif 1593 #endif
1598 #if defined(OS_CHROMEOS) 1594 #if defined(OS_CHROMEOS)
1599 switches::kDisableVaapiAcceleratedVideoEncode, 1595 switches::kDisableVaapiAcceleratedVideoEncode,
1600 #endif 1596 #endif
1601 #if defined(ENABLE_IPC_FUZZER) 1597 #if defined(ENABLE_IPC_FUZZER)
1602 switches::kIpcDumpDirectory, 1598 switches::kIpcDumpDirectory,
1603 switches::kIpcFuzzerTestcase, 1599 switches::kIpcFuzzerTestcase,
1604 #endif 1600 #endif
1605 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) 1601 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
1606 switches::kUseMusInRenderer, 1602 switches::kUseMusInRenderer,
1607 ui::switches::kUseMojoGpuCommandBufferInMus,
1608 #endif 1603 #endif
1609 }; 1604 };
1610 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1605 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1611 arraysize(kSwitchNames)); 1606 arraysize(kSwitchNames));
1612 1607
1613 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd); 1608 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd);
1614 1609
1615 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1610 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1616 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) { 1611 BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
1617 // Pass kTraceStartup switch to renderer only if startup tracing has not 1612 // Pass kTraceStartup switch to renderer only if startup tracing has not
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2793 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 2788 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
2794 2789
2795 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias 2790 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias
2796 // enough information here so that we can determine what the bad message was. 2791 // enough information here so that we can determine what the bad message was.
2797 base::debug::Alias(&error); 2792 base::debug::Alias(&error);
2798 bad_message::ReceivedBadMessage(process.get(), 2793 bad_message::ReceivedBadMessage(process.get(),
2799 bad_message::RPH_MOJO_PROCESS_ERROR); 2794 bad_message::RPH_MOJO_PROCESS_ERROR);
2800 } 2795 }
2801 2796
2802 } // namespace content 2797 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698