diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/content/browser/browser_process_sub_thread.cc | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_process_sub_thread.cc')
| -rw-r--r-- | chromium/content/browser/browser_process_sub_thread.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/chromium/content/browser/browser_process_sub_thread.cc b/chromium/content/browser/browser_process_sub_thread.cc index 876318dc799..9172012c111 100644 --- a/chromium/content/browser/browser_process_sub_thread.cc +++ b/chromium/content/browser/browser_process_sub_thread.cc @@ -11,7 +11,6 @@ #include "base/trace_event/memory_dump_manager.h" #include "content/browser/browser_child_process_host_impl.h" #include "content/browser/browser_thread_impl.h" -#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" #include "content/browser/notification_service_impl.h" #include "content/browser/utility_process_host.h" #include "content/common/child_process_host_impl.h" @@ -162,10 +161,8 @@ void BrowserProcessSubThread::CompleteInitializationOnBrowserThread() { } } -// We disable optimizations for Run specifications so the compiler doesn't merge -// them all together. -MSVC_DISABLE_OPTIMIZE() -MSVC_PUSH_DISABLE_WARNING(4748) +// Mark following two functions as NOINLINE so the compiler doesn't merge +// them together. NOINLINE void BrowserProcessSubThread::UIThreadRun(base::RunLoop* run_loop) { const int line_number = __LINE__; @@ -179,9 +176,6 @@ NOINLINE void BrowserProcessSubThread::IOThreadRun(base::RunLoop* run_loop) { base::debug::Alias(&line_number); } -MSVC_POP_WARNING() -MSVC_ENABLE_OPTIMIZE(); - void BrowserProcessSubThread::IOThreadCleanUp() { DCHECK_CALLED_ON_VALID_THREAD(browser_thread_checker_); @@ -222,10 +216,6 @@ void BrowserProcessSubThread::IOThreadCleanUp() { // and delete the BrowserChildProcessHost instances to release whatever // IO thread only resources they are referencing. BrowserChildProcessHostImpl::TerminateAll(); - - // Unregister GpuMemoryBuffer dump provider before IO thread is shut down. - base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider( - BrowserGpuMemoryBufferManager::current()); } } // namespace content |