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 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
641 | 641 |
642 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA)) | 642 #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. | 643 // On Mac and Android Java UI, the select popups are rendered by the browser. |
644 blink::WebView::setUseExternalPopupMenus(true); | 644 blink::WebView::setUseExternalPopupMenus(true); |
645 #endif | 645 #endif |
646 | 646 |
647 lazy_tls.Pointer()->Set(this); | 647 lazy_tls.Pointer()->Set(this); |
648 | 648 |
649 // Register this object as the main thread. | 649 // Register this object as the main thread. |
650 ChildProcess::current()->set_main_thread(this); | 650 ChildProcess::current()->set_main_thread(this); |
| 651 renderer_scheduler_->SetThreadBlameContext(&blame_context_); |
651 | 652 |
652 // In single process the single process is all there is. | 653 // In single process the single process is all there is. |
653 notify_webkit_of_modal_loop_ = true; | 654 notify_webkit_of_modal_loop_ = true; |
654 webkit_shared_timer_suspended_ = false; | 655 webkit_shared_timer_suspended_ = false; |
655 widget_count_ = 0; | 656 widget_count_ = 0; |
656 hidden_widget_count_ = 0; | 657 hidden_widget_count_ = 0; |
657 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; | 658 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; |
658 idle_notifications_to_skip_ = 0; | 659 idle_notifications_to_skip_ = 0; |
659 layout_test_mode_ = false; | 660 layout_test_mode_ = false; |
660 | 661 |
(...skipping 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2176 } | 2177 } |
2177 | 2178 |
2178 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2179 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2179 size_t erased = | 2180 size_t erased = |
2180 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2181 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2181 routing_id_); | 2182 routing_id_); |
2182 DCHECK_EQ(1u, erased); | 2183 DCHECK_EQ(1u, erased); |
2183 } | 2184 } |
2184 | 2185 |
2185 } // namespace content | 2186 } // namespace content |
OLD | NEW |