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

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: remove ChildNativePixmapManager or BrowserNativePixmapManager 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 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 #endif 1388 #endif
1385 #if defined(OS_MACOSX) 1389 #if defined(OS_MACOSX)
1386 // Allow this to be set when invoking the browser and relayed along. 1390 // Allow this to be set when invoking the browser and relayed along.
1387 switches::kEnableSandboxLogging, 1391 switches::kEnableSandboxLogging,
1388 #endif 1392 #endif
1389 #if defined(OS_WIN) 1393 #if defined(OS_WIN)
1390 switches::kDisableDirectWrite, 1394 switches::kDisableDirectWrite,
1391 switches::kDisableWin32kRendererLockDown, 1395 switches::kDisableWin32kRendererLockDown,
1392 switches::kTraceExportEventsToETW, 1396 switches::kTraceExportEventsToETW,
1393 #endif 1397 #endif
1398 #if defined(USE_OZONE)
1399 switches::kOzonePlatform,
1400 #endif
reveman 2015/07/23 14:46:12 what does this have to do with this patch?
dshwang 2015/07/23 16:42:09 yes, renderer creates NativePixmapManager. at the
reveman 2015/07/23 18:25:23 In that case, you need to add it here too: https:/
dshwang 2015/07/24 12:19:00 thx for consideration, but chrome_restart_request
1394 #if defined(OS_CHROMEOS) 1401 #if defined(OS_CHROMEOS)
1395 switches::kDisableVaapiAcceleratedVideoEncode, 1402 switches::kDisableVaapiAcceleratedVideoEncode,
1396 #endif 1403 #endif
1397 }; 1404 };
1398 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1405 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1399 arraysize(kSwitchNames)); 1406 arraysize(kSwitchNames));
1400 1407
1401 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1408 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1402 BrowserMainLoop::GetInstance()->is_tracing_startup()) { 1409 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
1403 // Pass kTraceStartup switch to renderer only if startup tracing has not 1410 // Pass kTraceStartup switch to renderer only if startup tracing has not
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
2507 void RenderProcessHostImpl::GetAudioOutputControllers( 2514 void RenderProcessHostImpl::GetAudioOutputControllers(
2508 const GetAudioOutputControllersCallback& callback) const { 2515 const GetAudioOutputControllersCallback& callback) const {
2509 audio_renderer_host()->GetOutputControllers(callback); 2516 audio_renderer_host()->GetOutputControllers(callback);
2510 } 2517 }
2511 2518
2512 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() { 2519 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
2513 return bluetooth_dispatcher_host_.get(); 2520 return bluetooth_dispatcher_host_.get();
2514 } 2521 }
2515 2522
2516 } // namespace content 2523 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698