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

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

Issue 2649553003: gpu: merge gpu/ipc/host/gpu_memory_buffer_support.cc to gpu/ipc/common/
Patch Set: fix bot failure Created 3 years, 11 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #include "content/public/common/result_codes.h" 163 #include "content/public/common/result_codes.h"
164 #include "content/public/common/sandboxed_process_launcher_delegate.h" 164 #include "content/public/common/sandboxed_process_launcher_delegate.h"
165 #include "content/public/common/service_names.mojom.h" 165 #include "content/public/common/service_names.mojom.h"
166 #include "content/public/common/url_constants.h" 166 #include "content/public/common/url_constants.h"
167 #include "device/battery/battery_monitor_impl.h" 167 #include "device/battery/battery_monitor_impl.h"
168 #include "device/gamepad/gamepad_monitor.h" 168 #include "device/gamepad/gamepad_monitor.h"
169 #include "gpu/GLES2/gl2extchromium.h" 169 #include "gpu/GLES2/gl2extchromium.h"
170 #include "gpu/command_buffer/client/gpu_switches.h" 170 #include "gpu/command_buffer/client/gpu_switches.h"
171 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 171 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
172 #include "gpu/command_buffer/service/gpu_switches.h" 172 #include "gpu/command_buffer/service/gpu_switches.h"
173 #include "gpu/ipc/host/gpu_memory_buffer_support.h" 173 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
174 #include "gpu/ipc/common/gpu_switches.h"
174 #include "ipc/ipc.mojom.h" 175 #include "ipc/ipc.mojom.h"
175 #include "ipc/ipc_channel.h" 176 #include "ipc/ipc_channel.h"
176 #include "ipc/ipc_channel_mojo.h" 177 #include "ipc/ipc_channel_mojo.h"
177 #include "ipc/ipc_logging.h" 178 #include "ipc/ipc_logging.h"
178 #include "media/base/media_switches.h" 179 #include "media/base/media_switches.h"
179 #include "media/media_features.h" 180 #include "media/media_features.h"
180 #include "mojo/edk/embedder/embedder.h" 181 #include "mojo/edk/embedder/embedder.h"
181 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" 182 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
182 #include "net/url_request/url_request_context_getter.h" 183 #include "net/url_request/url_request_context_getter.h"
183 #include "ppapi/features/features.h" 184 #include "ppapi/features/features.h"
(...skipping 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 switches::kEnableBlinkFeatures, 1727 switches::kEnableBlinkFeatures,
1727 switches::kEnableBrowserSideNavigation, 1728 switches::kEnableBrowserSideNavigation,
1728 switches::kEnableColorCorrectRenderingDefaultMode, 1729 switches::kEnableColorCorrectRenderingDefaultMode,
1729 switches::kEnableDisplayList2dCanvas, 1730 switches::kEnableDisplayList2dCanvas,
1730 switches::kEnableDistanceFieldText, 1731 switches::kEnableDistanceFieldText,
1731 switches::kEnableExperimentalCanvasFeatures, 1732 switches::kEnableExperimentalCanvasFeatures,
1732 switches::kEnableExperimentalWebPlatformFeatures, 1733 switches::kEnableExperimentalWebPlatformFeatures,
1733 switches::kEnableHeapProfiling, 1734 switches::kEnableHeapProfiling,
1734 switches::kEnableGPUClientLogging, 1735 switches::kEnableGPUClientLogging,
1735 switches::kEnableGpuClientTracing, 1736 switches::kEnableGpuClientTracing,
1737 switches::kEnableNativeGpuMemoryBuffers,
1736 switches::kEnableGpuMemoryBufferVideoFrames, 1738 switches::kEnableGpuMemoryBufferVideoFrames,
1737 switches::kEnableGPUServiceLogging, 1739 switches::kEnableGPUServiceLogging,
1738 switches::kEnableIconNtp, 1740 switches::kEnableIconNtp,
1739 switches::kEnableLowResTiling, 1741 switches::kEnableLowResTiling,
1740 switches::kEnableMediaSuspend, 1742 switches::kEnableMediaSuspend,
1741 switches::kEnableInbandTextTracks, 1743 switches::kEnableInbandTextTracks,
1742 switches::kEnableLCDText, 1744 switches::kEnableLCDText,
1743 switches::kEnableLogging, 1745 switches::kEnableLogging,
1744 switches::kEnableNetworkInformation, 1746 switches::kEnableNetworkInformation,
1745 switches::kEnableOverlayScrollbar, 1747 switches::kEnableOverlayScrollbar,
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
3039 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 3041 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
3040 3042
3041 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. 3043 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing.
3042 // Capture the error message in a crash key value. 3044 // Capture the error message in a crash key value.
3043 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); 3045 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error);
3044 bad_message::ReceivedBadMessage(render_process_id, 3046 bad_message::ReceivedBadMessage(render_process_id,
3045 bad_message::RPH_MOJO_PROCESS_ERROR); 3047 bad_message::RPH_MOJO_PROCESS_ERROR);
3046 } 3048 }
3047 3049
3048 } // namespace content 3050 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698