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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to lastest crrev.com/1128113011 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/gpu/browser_native_pixmap_manager_ozone.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #include "base/memory/memory_pressure_monitor_mac.h" 101 #include "base/memory/memory_pressure_monitor_mac.h"
102 #include "content/browser/bootstrap_sandbox_mac.h" 102 #include "content/browser/bootstrap_sandbox_mac.h"
103 #include "content/browser/browser_io_surface_manager_mac.h" 103 #include "content/browser/browser_io_surface_manager_mac.h"
104 #include "content/browser/cocoa/system_hotkey_helper_mac.h" 104 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
105 #include "content/browser/compositor/browser_compositor_view_mac.h" 105 #include "content/browser/compositor/browser_compositor_view_mac.h"
106 #include "content/browser/in_process_io_surface_manager_mac.h" 106 #include "content/browser/in_process_io_surface_manager_mac.h"
107 #include "content/browser/theme_helper_mac.h" 107 #include "content/browser/theme_helper_mac.h"
108 #endif 108 #endif
109 109
110 #if defined(USE_OZONE) 110 #if defined(USE_OZONE)
111 #include "ui/ozone/public/native_pixmap_manager.h" 111 #include "content/browser/gpu/browser_native_pixmap_manager_ozone.h"
112 #endif 112 #endif
113 113
114 #if defined(OS_WIN) 114 #if defined(OS_WIN)
115 #include <windows.h> 115 #include <windows.h>
116 #include <commctrl.h> 116 #include <commctrl.h>
117 #include <shellapi.h> 117 #include <shellapi.h>
118 118
119 #include "base/memory/memory_pressure_monitor_win.h" 119 #include "base/memory/memory_pressure_monitor_win.h"
120 #include "content/browser/system_message_window_win.h" 120 #include "content/browser/system_message_window_win.h"
121 #include "content/common/sandbox_win.h" 121 #include "content/common/sandbox_win.h"
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) { 612 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
613 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); 613 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance());
614 } else { 614 } else {
615 IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance()); 615 IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance());
616 } 616 }
617 } 617 }
618 #endif 618 #endif
619 619
620 #if defined(USE_OZONE) 620 #if defined(USE_OZONE)
621 DCHECK(!ui::NativePixmapManager::GetInstance()); 621 DCHECK(!ui::NativePixmapManager::GetInstance());
622 ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create()); 622 ui::NativePixmapManager::SetInstance(
623 BrowserNativePixmapManager::GetInstance());
623 #endif 624 #endif
624 625
625 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { 626 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
626 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); 627 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
627 memory_observer_.reset(new MemoryObserver()); 628 memory_observer_.reset(new MemoryObserver());
628 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); 629 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get());
629 } 630 }
630 631
631 if (parsed_command_line_.HasSwitch( 632 if (parsed_command_line_.HasSwitch(
632 switches::kEnableAggressiveDOMStorageFlushing)) { 633 switches::kEnableAggressiveDOMStorageFlushing)) {
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1354 DCHECK(is_tracing_startup_); 1355 DCHECK(is_tracing_startup_);
1355 1356
1356 is_tracing_startup_ = false; 1357 is_tracing_startup_ = false;
1357 TracingController::GetInstance()->DisableRecording( 1358 TracingController::GetInstance()->DisableRecording(
1358 TracingController::CreateFileSink( 1359 TracingController::CreateFileSink(
1359 startup_trace_file_, 1360 startup_trace_file_,
1360 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1361 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1361 } 1362 }
1362 1363
1363 } // namespace content 1364 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/gpu/browser_native_pixmap_manager_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698