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

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

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to crrev.com/1258713002 Created 5 years, 5 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 #include "content/common/font_cache_dispatcher_win.h" 182 #include "content/common/font_cache_dispatcher_win.h"
183 #include "content/common/sandbox_win.h" 183 #include "content/common/sandbox_win.h"
184 #include "sandbox/win/src/sandbox_policy.h" 184 #include "sandbox/win/src/sandbox_policy.h"
185 #include "ui/gfx/win/dpi.h" 185 #include "ui/gfx/win/dpi.h"
186 #endif 186 #endif
187 187
188 #if defined(OS_MACOSX) && !defined(OS_IOS) 188 #if defined(OS_MACOSX) && !defined(OS_IOS)
189 #include "content/browser/browser_io_surface_manager_mac.h" 189 #include "content/browser/browser_io_surface_manager_mac.h"
190 #endif 190 #endif
191 191
192 #if defined(USE_OZONE)
193 #include "ui/ozone/public/ozone_switches.h"
194 #endif
195
192 #if defined(ENABLE_BROWSER_CDMS) 196 #if defined(ENABLE_BROWSER_CDMS)
193 #include "content/browser/media/cdm/browser_cdm_manager.h" 197 #include "content/browser/media/cdm/browser_cdm_manager.h"
194 #endif 198 #endif
195 199
196 #if defined(ENABLE_PLUGINS) 200 #if defined(ENABLE_PLUGINS)
197 #include "content/browser/plugin_service_impl.h" 201 #include "content/browser/plugin_service_impl.h"
198 #endif 202 #endif
199 203
200 #if defined(ENABLE_WEBRTC) 204 #if defined(ENABLE_WEBRTC)
201 #include "content/browser/media/webrtc_internals.h" 205 #include "content/browser/media/webrtc_internals.h"
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 #endif 1390 #endif
1387 #if defined(OS_MACOSX) 1391 #if defined(OS_MACOSX)
1388 // Allow this to be set when invoking the browser and relayed along. 1392 // Allow this to be set when invoking the browser and relayed along.
1389 switches::kEnableSandboxLogging, 1393 switches::kEnableSandboxLogging,
1390 #endif 1394 #endif
1391 #if defined(OS_WIN) 1395 #if defined(OS_WIN)
1392 switches::kDisableDirectWrite, 1396 switches::kDisableDirectWrite,
1393 switches::kDisableWin32kRendererLockDown, 1397 switches::kDisableWin32kRendererLockDown,
1394 switches::kTraceExportEventsToETW, 1398 switches::kTraceExportEventsToETW,
1395 #endif 1399 #endif
1400 #if defined(USE_OZONE)
1401 switches::kOzonePlatform,
1402 #endif
1396 #if defined(OS_CHROMEOS) 1403 #if defined(OS_CHROMEOS)
1397 switches::kDisableVaapiAcceleratedVideoEncode, 1404 switches::kDisableVaapiAcceleratedVideoEncode,
1398 #endif 1405 #endif
1399 }; 1406 };
1400 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1407 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1401 arraysize(kSwitchNames)); 1408 arraysize(kSwitchNames));
1402 1409
1403 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1410 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1404 BrowserMainLoop::GetInstance()->is_tracing_startup()) { 1411 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
1405 // Pass kTraceStartup switch to renderer only if startup tracing has not 1412 // Pass kTraceStartup switch to renderer only if startup tracing has not
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
2509 void RenderProcessHostImpl::GetAudioOutputControllers( 2516 void RenderProcessHostImpl::GetAudioOutputControllers(
2510 const GetAudioOutputControllersCallback& callback) const { 2517 const GetAudioOutputControllersCallback& callback) const {
2511 audio_renderer_host()->GetOutputControllers(callback); 2518 audio_renderer_host()->GetOutputControllers(callback);
2512 } 2519 }
2513 2520
2514 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() { 2521 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
2515 return bluetooth_dispatcher_host_.get(); 2522 return bluetooth_dispatcher_host_.get();
2516 } 2523 }
2517 2524
2518 } // namespace content 2525 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698