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

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

Issue 1532813002: Replace IOSurfaceManager by directly passing IOSurface Mach ports over Chrome IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows compile Created 4 years, 12 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 (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/feature_list.h" 9 #include "base/feature_list.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #include "content/browser/android/in_process_surface_texture_manager.h" 99 #include "content/browser/android/in_process_surface_texture_manager.h"
100 #include "content/browser/android/tracing_controller_android.h" 100 #include "content/browser/android/tracing_controller_android.h"
101 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h" 101 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h"
102 #include "content/public/browser/screen_orientation_provider.h" 102 #include "content/public/browser/screen_orientation_provider.h"
103 #include "ui/gl/gl_surface.h" 103 #include "ui/gl/gl_surface.h"
104 #endif 104 #endif
105 105
106 #if defined(OS_MACOSX) && !defined(OS_IOS) 106 #if defined(OS_MACOSX) && !defined(OS_IOS)
107 #include "base/memory/memory_pressure_monitor_mac.h" 107 #include "base/memory/memory_pressure_monitor_mac.h"
108 #include "content/browser/bootstrap_sandbox_manager_mac.h" 108 #include "content/browser/bootstrap_sandbox_manager_mac.h"
109 #include "content/browser/browser_io_surface_manager_mac.h"
110 #include "content/browser/cocoa/system_hotkey_helper_mac.h" 109 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
111 #include "content/browser/compositor/browser_compositor_view_mac.h" 110 #include "content/browser/compositor/browser_compositor_view_mac.h"
112 #include "content/browser/in_process_io_surface_manager_mac.h"
113 #include "content/browser/theme_helper_mac.h" 111 #include "content/browser/theme_helper_mac.h"
114 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" 112 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
115 #endif 113 #endif
116 114
117 #if defined(USE_OZONE) 115 #if defined(USE_OZONE)
118 #include "ui/ozone/public/client_native_pixmap_factory.h" 116 #include "ui/ozone/public/client_native_pixmap_factory.h"
119 #include "ui/ozone/public/ozone_platform.h" 117 #include "ui/ozone/public/ozone_platform.h"
120 #endif 118 #endif
121 119
122 #if defined(OS_WIN) 120 #if defined(OS_WIN)
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 TRACE_EVENT0("startup", 647 TRACE_EVENT0("startup",
650 "BrowserMainLoop::Subsystem:ScreenOrientationProvider"); 648 "BrowserMainLoop::Subsystem:ScreenOrientationProvider");
651 screen_orientation_delegate_.reset( 649 screen_orientation_delegate_.reset(
652 new ScreenOrientationDelegateAndroid()); 650 new ScreenOrientationDelegateAndroid());
653 ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get()); 651 ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get());
654 } 652 }
655 #endif 653 #endif
656 #endif 654 #endif
657 655
658 #if defined(OS_MACOSX) && !defined(OS_IOS) 656 #if defined(OS_MACOSX) && !defined(OS_IOS)
659 {
660 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:IOSurfaceManager");
661 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
662 gfx::IOSurfaceManager::SetInstance(
663 InProcessIOSurfaceManager::GetInstance());
664 } else {
665 gfx::IOSurfaceManager::SetInstance(
666 BrowserIOSurfaceManager::GetInstance());
667 }
668 }
669
670 if (BootstrapSandboxManager::ShouldEnable()) { 657 if (BootstrapSandboxManager::ShouldEnable()) {
671 TRACE_EVENT0("startup", 658 TRACE_EVENT0("startup",
672 "BrowserMainLoop::Subsystem:BootstrapSandbox"); 659 "BrowserMainLoop::Subsystem:BootstrapSandbox");
673 CHECK(BootstrapSandboxManager::GetInstance()); 660 CHECK(BootstrapSandboxManager::GetInstance());
674 } 661 }
675 #endif 662 #endif
676 663
677 #if defined(USE_OZONE) 664 #if defined(USE_OZONE)
678 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); 665 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
679 ui::ClientNativePixmapFactory::SetInstance( 666 ui::ClientNativePixmapFactory::SetInstance(
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 DCHECK(is_tracing_startup_for_duration_); 1460 DCHECK(is_tracing_startup_for_duration_);
1474 1461
1475 is_tracing_startup_for_duration_ = false; 1462 is_tracing_startup_for_duration_ = false;
1476 TracingController::GetInstance()->StopTracing( 1463 TracingController::GetInstance()->StopTracing(
1477 TracingController::CreateFileSink( 1464 TracingController::CreateFileSink(
1478 startup_trace_file_, 1465 startup_trace_file_,
1479 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1466 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1480 } 1467 }
1481 1468
1482 } // namespace content 1469 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698