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 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "base/timer/timer.h" | 23 #include "base/timer/timer.h" |
24 #include "build/build_config.h" | 24 #include "build/build_config.h" |
25 #include "content/child/child_thread_impl.h" | 25 #include "content/child/child_thread_impl.h" |
26 #include "content/common/content_export.h" | 26 #include "content/common/content_export.h" |
27 #include "content/common/frame_replication_state.h" | 27 #include "content/common/frame_replication_state.h" |
28 #include "content/common/gpu/client/gpu_channel_host.h" | 28 #include "content/common/gpu/client/gpu_channel_host.h" |
29 #include "content/common/gpu_process_launch_causes.h" | 29 #include "content/common/gpu_process_launch_causes.h" |
30 #include "content/common/storage_partition_service.mojom.h" | 30 #include "content/common/storage_partition_service.mojom.h" |
31 #include "content/public/renderer/render_thread.h" | 31 #include "content/public/renderer/render_thread.h" |
32 #include "content/renderer/gpu/compositor_dependencies.h" | 32 #include "content/renderer/gpu/compositor_dependencies.h" |
| 33 #include "content/renderer/render_thread_blame_context.h" |
33 #include "net/base/network_change_notifier.h" | 34 #include "net/base/network_change_notifier.h" |
34 #include "third_party/WebKit/public/platform/WebConnectionType.h" | 35 #include "third_party/WebKit/public/platform/WebConnectionType.h" |
35 #include "ui/gfx/native_widget_types.h" | 36 #include "ui/gfx/native_widget_types.h" |
36 | 37 |
37 #if defined(OS_MACOSX) | 38 #if defined(OS_MACOSX) |
38 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" | 39 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" |
39 #endif | 40 #endif |
40 | 41 |
41 class GrContext; | 42 class GrContext; |
42 class SkBitmap; | 43 class SkBitmap; |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 void AddEmbeddedWorkerRoute(int32_t routing_id, IPC::Listener* listener); | 450 void AddEmbeddedWorkerRoute(int32_t routing_id, IPC::Listener* listener); |
450 void RemoveEmbeddedWorkerRoute(int32_t routing_id); | 451 void RemoveEmbeddedWorkerRoute(int32_t routing_id); |
451 | 452 |
452 void RegisterPendingRenderFrameConnect( | 453 void RegisterPendingRenderFrameConnect( |
453 int routing_id, | 454 int routing_id, |
454 mojo::shell::mojom::InterfaceProviderRequest services, | 455 mojo::shell::mojom::InterfaceProviderRequest services, |
455 mojo::shell::mojom::InterfaceProviderPtr exposed_services); | 456 mojo::shell::mojom::InterfaceProviderPtr exposed_services); |
456 | 457 |
457 StoragePartitionService* GetStoragePartitionService(); | 458 StoragePartitionService* GetStoragePartitionService(); |
458 | 459 |
| 460 RenderThreadBlameContext* blame_context() { return &blame_context_; } |
| 461 |
459 protected: | 462 protected: |
460 RenderThreadImpl( | 463 RenderThreadImpl( |
461 const InProcessChildThreadParams& params, | 464 const InProcessChildThreadParams& params, |
462 scoped_ptr<scheduler::RendererScheduler> scheduler, | 465 scoped_ptr<scheduler::RendererScheduler> scheduler, |
463 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue); | 466 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue); |
464 RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop, | 467 RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop, |
465 scoped_ptr<scheduler::RendererScheduler> scheduler); | 468 scoped_ptr<scheduler::RendererScheduler> scheduler); |
466 | 469 |
467 private: | 470 private: |
468 // ChildThread | 471 // ChildThread |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
703 mojo::shell::mojom::InterfaceProviderRequest services_; | 706 mojo::shell::mojom::InterfaceProviderRequest services_; |
704 mojo::shell::mojom::InterfaceProviderPtr exposed_services_; | 707 mojo::shell::mojom::InterfaceProviderPtr exposed_services_; |
705 }; | 708 }; |
706 | 709 |
707 typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>> | 710 typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>> |
708 PendingRenderFrameConnectMap; | 711 PendingRenderFrameConnectMap; |
709 PendingRenderFrameConnectMap pending_render_frame_connects_; | 712 PendingRenderFrameConnectMap pending_render_frame_connects_; |
710 | 713 |
711 StoragePartitionServicePtr storage_partition_service_; | 714 StoragePartitionServicePtr storage_partition_service_; |
712 | 715 |
| 716 RenderThreadBlameContext blame_context_; |
| 717 |
713 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 718 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
714 }; | 719 }; |
715 | 720 |
716 #if defined(COMPILER_MSVC) | 721 #if defined(COMPILER_MSVC) |
717 #pragma warning(pop) | 722 #pragma warning(pop) |
718 #endif | 723 #endif |
719 | 724 |
720 } // namespace content | 725 } // namespace content |
721 | 726 |
722 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 727 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |