content/browser/renderer_host/render_process_host_impl.cc - Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes.

Unified 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 side-by-side diff with in-line comments

Download patch

« content/browser/browser_main_loop.cc ('K') | « content/browser/browser_main_loop.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc » ('j') | content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_process_host_impl.cc

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc

index 6b1c30c7e4cf23fbda88ebccc0a1b7d9a80040e3..cd56882f912ba2212a67a19da6e73049f08d799b 100644

--- a/content/browser/renderer_host/render_process_host_impl.cc

+++ b/content/browser/renderer_host/render_process_host_impl.cc

@@ -189,6 +189,10 @@

#include "content/browser/browser_io_surface_manager_mac.h"

#endif

+#if defined(USE_OZONE)

+#include "ui/ozone/public/ozone_switches.h"

+#endif

#if defined(ENABLE_BROWSER_CDMS)

#include "content/browser/media/cdm/browser_cdm_manager.h"

#endif

@@ -1391,6 +1395,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(

switches::kDisableWin32kRendererLockDown,

switches::kTraceExportEventsToETW,

#endif

+#if defined(USE_OZONE)

+ switches::kOzonePlatform,

+#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

#if defined(OS_CHROMEOS)

switches::kDisableVaapiAcceleratedVideoEncode,

#endif