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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1683583002: Report user actions when gesture starts and stops in user_model. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 .Build()), 628 .Build()),
629 renderer_scheduler_(std::move(scheduler)), 629 renderer_scheduler_(std::move(scheduler)),
630 main_message_loop_(std::move(main_message_loop)), 630 main_message_loop_(std::move(main_message_loop)),
631 raster_worker_pool_(new RasterWorkerPool()) { 631 raster_worker_pool_(new RasterWorkerPool()) {
632 Init(); 632 Init();
633 } 633 }
634 634
635 void RenderThreadImpl::Init() { 635 void RenderThreadImpl::Init() {
636 TRACE_EVENT0("startup", "RenderThreadImpl::Init"); 636 TRACE_EVENT0("startup", "RenderThreadImpl::Init");
637 637
638 base::RemoveActionCallback(action_callback_);
639 action_callback_ = base::Bind(&RenderThreadImpl::RecordComputedAction,
640 base::Unretained(this));
641 base::AddActionCallback(action_callback_);
642
638 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( 643 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex(
639 base::PlatformThread::CurrentId(), 644 base::PlatformThread::CurrentId(),
640 kTraceEventRendererMainThreadSortIndex); 645 kTraceEventRendererMainThreadSortIndex);
641 646
642 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA)) 647 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA))
643 // On Mac and Android Java UI, the select popups are rendered by the browser. 648 // On Mac and Android Java UI, the select popups are rendered by the browser.
644 blink::WebView::setUseExternalPopupMenus(true); 649 blink::WebView::setUseExternalPopupMenus(true);
645 #endif 650 #endif
646 651
647 lazy_tls.Pointer()->Set(this); 652 lazy_tls.Pointer()->Set(this);
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 856
852 #if defined(MOJO_SHELL_CLIENT) 857 #if defined(MOJO_SHELL_CLIENT)
853 // We may not have a MojoShellConnection object in tests that directly 858 // We may not have a MojoShellConnection object in tests that directly
854 // instantiate a RenderThreadImpl. 859 // instantiate a RenderThreadImpl.
855 if (MojoShellConnection::Get()) 860 if (MojoShellConnection::Get())
856 CreateRenderWidgetWindowTreeClientFactory(); 861 CreateRenderWidgetWindowTreeClientFactory();
857 #endif 862 #endif
858 } 863 }
859 864
860 RenderThreadImpl::~RenderThreadImpl() { 865 RenderThreadImpl::~RenderThreadImpl() {
866 base::RemoveActionCallback(action_callback_);
861 } 867 }
862 868
863 void RenderThreadImpl::Shutdown() { 869 void RenderThreadImpl::Shutdown() {
864 FOR_EACH_OBSERVER( 870 FOR_EACH_OBSERVER(
865 RenderProcessObserver, observers_, OnRenderProcessShutdown()); 871 RenderProcessObserver, observers_, OnRenderProcessShutdown());
866 872
867 if (memory_observer_) { 873 if (memory_observer_) {
868 message_loop()->RemoveTaskObserver(memory_observer_.get()); 874 message_loop()->RemoveTaskObserver(memory_observer_.get());
869 memory_observer_.reset(); 875 memory_observer_.reset();
870 } 876 }
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
2166 } 2172 }
2167 2173
2168 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2174 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2169 size_t erased = 2175 size_t erased =
2170 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2176 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2171 routing_id_); 2177 routing_id_);
2172 DCHECK_EQ(1u, erased); 2178 DCHECK_EQ(1u, erased);
2173 } 2179 }
2174 2180
2175 } // namespace content 2181 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698