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_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 #include <string> | 10 #include <string> |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
132 base::Callback<void(const std::string&)> callback) override; | 132 base::Callback<void(const std::string&)> callback) override; |
133 virtual WebRtcStopRtpDumpCallback StartRtpDump( | 133 virtual WebRtcStopRtpDumpCallback StartRtpDump( |
134 bool incoming, | 134 bool incoming, |
135 bool outgoing, | 135 bool outgoing, |
136 const WebRtcRtpPacketCallback& packet_callback) override; | 136 const WebRtcRtpPacketCallback& packet_callback) override; |
137 #endif | 137 #endif |
138 virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id) | 138 virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id) |
139 override; | 139 override; |
140 virtual void NotifyTimezoneChange() override; | 140 virtual void NotifyTimezoneChange() override; |
141 virtual ServiceRegistry* GetServiceRegistry() override; | 141 virtual ServiceRegistry* GetServiceRegistry() override; |
142 virtual const base::TimeTicks& GetInitTime() const; | |
nasko
2014/10/13 15:55:24
This method is no longer inherited, so why is it v
carlosk
2014/10/13 18:01:46
Done, not virtual anymore. I forgot to update it a
| |
142 | 143 |
143 // IPC::Sender via RenderProcessHost. | 144 // IPC::Sender via RenderProcessHost. |
144 virtual bool Send(IPC::Message* msg) override; | 145 virtual bool Send(IPC::Message* msg) override; |
145 | 146 |
146 // IPC::Listener via RenderProcessHost. | 147 // IPC::Listener via RenderProcessHost. |
147 virtual bool OnMessageReceived(const IPC::Message& msg) override; | 148 virtual bool OnMessageReceived(const IPC::Message& msg) override; |
148 virtual void OnChannelConnected(int32 peer_pid) override; | 149 virtual void OnChannelConnected(int32 peer_pid) override; |
149 virtual void OnChannelError() override; | 150 virtual void OnChannelError() override; |
150 virtual void OnBadMessageReceived(const IPC::Message& message) override; | 151 virtual void OnBadMessageReceived(const IPC::Message& message) override; |
151 | 152 |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
364 // The filter for MessagePort messages coming from the renderer. | 365 // The filter for MessagePort messages coming from the renderer. |
365 scoped_refptr<MessagePortMessageFilter> message_port_message_filter_; | 366 scoped_refptr<MessagePortMessageFilter> message_port_message_filter_; |
366 | 367 |
367 // Used in single-process mode. | 368 // Used in single-process mode. |
368 scoped_ptr<base::Thread> in_process_renderer_; | 369 scoped_ptr<base::Thread> in_process_renderer_; |
369 | 370 |
370 // True after Init() has been called. We can't just check channel_ because we | 371 // True after Init() has been called. We can't just check channel_ because we |
371 // also reset that in the case of process termination. | 372 // also reset that in the case of process termination. |
372 bool is_initialized_; | 373 bool is_initialized_; |
373 | 374 |
375 // The time at which the first call to Init happened and the child renderer | |
376 // process was created. | |
377 base::TimeTicks init_time_; | |
378 | |
374 // Used to launch and terminate the process without blocking the UI thread. | 379 // Used to launch and terminate the process without blocking the UI thread. |
375 scoped_ptr<ChildProcessLauncher> child_process_launcher_; | 380 scoped_ptr<ChildProcessLauncher> child_process_launcher_; |
376 | 381 |
377 // Messages we queue while waiting for the process handle. We queue them here | 382 // Messages we queue while waiting for the process handle. We queue them here |
378 // instead of in the channel so that we ensure they're sent after init related | 383 // instead of in the channel so that we ensure they're sent after init related |
379 // messages that are sent once the process handle is available. This is | 384 // messages that are sent once the process handle is available. This is |
380 // because the queued messages may have dependencies on the init messages. | 385 // because the queued messages may have dependencies on the init messages. |
381 std::queue<IPC::Message*> queued_messages_; | 386 std::queue<IPC::Message*> queued_messages_; |
382 | 387 |
383 // The globally-unique identifier for this RPH. | 388 // The globally-unique identifier for this RPH. |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
456 base::TimeTicks survive_for_worker_start_time_; | 461 base::TimeTicks survive_for_worker_start_time_; |
457 | 462 |
458 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_; | 463 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_; |
459 | 464 |
460 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl); | 465 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl); |
461 }; | 466 }; |
462 | 467 |
463 } // namespace content | 468 } // namespace content |
464 | 469 |
465 #endif // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ | 470 #endif // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ |
OLD | NEW |