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 11 matching lines...) Expand all Loading... |
22 #include "base/threading/thread_checker.h" | 22 #include "base/threading/thread_checker.h" |
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/storage_partition_service.mojom.h" | 29 #include "content/common/storage_partition_service.mojom.h" |
30 #include "content/public/renderer/render_thread.h" | 30 #include "content/public/renderer/render_thread.h" |
31 #include "content/renderer/gpu/compositor_dependencies.h" | 31 #include "content/renderer/gpu/compositor_dependencies.h" |
| 32 #include "content/renderer/render_thread_blame_context.h" |
32 #include "net/base/network_change_notifier.h" | 33 #include "net/base/network_change_notifier.h" |
33 #include "third_party/WebKit/public/platform/WebConnectionType.h" | 34 #include "third_party/WebKit/public/platform/WebConnectionType.h" |
34 #include "ui/gfx/native_widget_types.h" | 35 #include "ui/gfx/native_widget_types.h" |
35 | 36 |
36 #if defined(OS_MACOSX) | 37 #if defined(OS_MACOSX) |
37 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" | 38 #include "third_party/WebKit/public/web/mac/WebScrollbarTheme.h" |
38 #endif | 39 #endif |
39 | 40 |
40 class GrContext; | 41 class GrContext; |
41 class SkBitmap; | 42 class SkBitmap; |
(...skipping 407 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(const InProcessChildThreadParams& params, | 463 RenderThreadImpl(const InProcessChildThreadParams& params, |
461 scoped_ptr<scheduler::RendererScheduler> scheduler); | 464 scoped_ptr<scheduler::RendererScheduler> scheduler); |
462 RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop, | 465 RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop, |
463 scoped_ptr<scheduler::RendererScheduler> scheduler); | 466 scoped_ptr<scheduler::RendererScheduler> scheduler); |
464 virtual void SetResourceDispatchTaskQueue( | 467 virtual void SetResourceDispatchTaskQueue( |
465 const scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue); | 468 const scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue); |
466 | 469 |
467 private: | 470 private: |
468 // ChildThread | 471 // ChildThread |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 mojo::shell::mojom::InterfaceProviderRequest services_; | 703 mojo::shell::mojom::InterfaceProviderRequest services_; |
701 mojo::shell::mojom::InterfaceProviderPtr exposed_services_; | 704 mojo::shell::mojom::InterfaceProviderPtr exposed_services_; |
702 }; | 705 }; |
703 | 706 |
704 typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>> | 707 typedef std::map<int, scoped_refptr<PendingRenderFrameConnect>> |
705 PendingRenderFrameConnectMap; | 708 PendingRenderFrameConnectMap; |
706 PendingRenderFrameConnectMap pending_render_frame_connects_; | 709 PendingRenderFrameConnectMap pending_render_frame_connects_; |
707 | 710 |
708 StoragePartitionServicePtr storage_partition_service_; | 711 StoragePartitionServicePtr storage_partition_service_; |
709 | 712 |
| 713 RenderThreadBlameContext blame_context_; |
| 714 |
710 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 715 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
711 }; | 716 }; |
712 | 717 |
713 #if defined(COMPILER_MSVC) | 718 #if defined(COMPILER_MSVC) |
714 #pragma warning(pop) | 719 #pragma warning(pop) |
715 #endif | 720 #endif |
716 | 721 |
717 } // namespace content | 722 } // namespace content |
718 | 723 |
719 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 724 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |