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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.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

« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | content/browser/renderer_host/render_process_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 203400ea7757b12c8581abdb4556a2f1bca2f863..69a7cce4ed609681d467aece191debc0396f8fca 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -107,6 +107,10 @@

#include "content/browser/theme_helper_mac.h"

#endif

+#if defined(USE_OZONE)

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

+#endif

#if defined(OS_WIN)

#include <windows.h>

#include <commctrl.h>

@@ -613,6 +617,11 @@ void BrowserMainLoop::PostMainMessageLoopStart() {

}

#endif

+#if defined(USE_OZONE)

+ DCHECK(!ui::NativePixmapManager::GetInstance());

reveman 2015/07/23 14:46:12 nit: remove DCHECK. handled by SetInstance already

dshwang 2015/07/23 16:42:09 Done.

+ ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create());

+#endif

if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {

TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");

memory_observer_.reset(new MemoryObserver());