OLD | NEW |
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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 | 646 |
647 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA)) | 647 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA)) |
648 // 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. |
649 blink::WebView::setUseExternalPopupMenus(true); | 649 blink::WebView::setUseExternalPopupMenus(true); |
650 #endif | 650 #endif |
651 | 651 |
652 lazy_tls.Pointer()->Set(this); | 652 lazy_tls.Pointer()->Set(this); |
653 | 653 |
654 // Register this object as the main thread. | 654 // Register this object as the main thread. |
655 ChildProcess::current()->set_main_thread(this); | 655 ChildProcess::current()->set_main_thread(this); |
| 656 blame_context_.Initialize(); |
| 657 renderer_scheduler_->SetThreadBlameContext(&blame_context_); |
656 | 658 |
657 InitializeWebKit(resource_task_queue); | 659 InitializeWebKit(resource_task_queue); |
658 | 660 |
659 // In single process the single process is all there is. | 661 // In single process the single process is all there is. |
660 notify_webkit_of_modal_loop_ = true; | 662 notify_webkit_of_modal_loop_ = true; |
661 webkit_shared_timer_suspended_ = false; | 663 webkit_shared_timer_suspended_ = false; |
662 widget_count_ = 0; | 664 widget_count_ = 0; |
663 hidden_widget_count_ = 0; | 665 hidden_widget_count_ = 0; |
664 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; | 666 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; |
665 idle_notifications_to_skip_ = 0; | 667 idle_notifications_to_skip_ = 0; |
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2177 } | 2179 } |
2178 | 2180 |
2179 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2181 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2180 size_t erased = | 2182 size_t erased = |
2181 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2183 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2182 routing_id_); | 2184 routing_id_); |
2183 DCHECK_EQ(1u, erased); | 2185 DCHECK_EQ(1u, erased); |
2184 } | 2186 } |
2185 | 2187 |
2186 } // namespace content | 2188 } // namespace content |
OLD | NEW |