Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Side by Side Diff: trunk/src/content/renderer/render_thread_impl.cc

Issue 296213007: Revert 272504 "Destroy all rtc peer connection handlers before s..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/content/renderer/media/rtc_peer_connection_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <vector> 10 #include <vector>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 72 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
73 #include "content/renderer/input/input_event_filter.h" 73 #include "content/renderer/input/input_event_filter.h"
74 #include "content/renderer/input/input_handler_manager.h" 74 #include "content/renderer/input/input_handler_manager.h"
75 #include "content/renderer/media/audio_input_message_filter.h" 75 #include "content/renderer/media/audio_input_message_filter.h"
76 #include "content/renderer/media/audio_message_filter.h" 76 #include "content/renderer/media/audio_message_filter.h"
77 #include "content/renderer/media/audio_renderer_mixer_manager.h" 77 #include "content/renderer/media/audio_renderer_mixer_manager.h"
78 #include "content/renderer/media/media_stream_center.h" 78 #include "content/renderer/media/media_stream_center.h"
79 #include "content/renderer/media/midi_message_filter.h" 79 #include "content/renderer/media/midi_message_filter.h"
80 #include "content/renderer/media/peer_connection_tracker.h" 80 #include "content/renderer/media/peer_connection_tracker.h"
81 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" 81 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
82 #include "content/renderer/media/rtc_peer_connection_handler.h"
83 #include "content/renderer/media/video_capture_impl_manager.h" 82 #include "content/renderer/media/video_capture_impl_manager.h"
84 #include "content/renderer/media/video_capture_message_filter.h" 83 #include "content/renderer/media/video_capture_message_filter.h"
85 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 84 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
86 #include "content/renderer/media/webrtc_identity_service.h" 85 #include "content/renderer/media/webrtc_identity_service.h"
87 #include "content/renderer/p2p/socket_dispatcher.h" 86 #include "content/renderer/p2p/socket_dispatcher.h"
88 #include "content/renderer/render_process_impl.h" 87 #include "content/renderer/render_process_impl.h"
89 #include "content/renderer/render_view_impl.h" 88 #include "content/renderer/render_view_impl.h"
90 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 89 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
91 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h" 90 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h"
92 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" 91 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 devtools_agent_message_filter_ = NULL; 527 devtools_agent_message_filter_ = NULL;
529 } 528 }
530 529
531 RemoveFilter(audio_input_message_filter_.get()); 530 RemoveFilter(audio_input_message_filter_.get());
532 audio_input_message_filter_ = NULL; 531 audio_input_message_filter_ = NULL;
533 532
534 RemoveFilter(audio_message_filter_.get()); 533 RemoveFilter(audio_message_filter_.get());
535 audio_message_filter_ = NULL; 534 audio_message_filter_ = NULL;
536 535
537 #if defined(ENABLE_WEBRTC) 536 #if defined(ENABLE_WEBRTC)
538 RTCPeerConnectionHandler::DestructAllHandlers();
539
540 peer_connection_factory_.reset(); 537 peer_connection_factory_.reset();
541 #endif 538 #endif
542 RemoveFilter(vc_manager_->video_capture_message_filter()); 539 RemoveFilter(vc_manager_->video_capture_message_filter());
543 vc_manager_.reset(); 540 vc_manager_.reset();
544 541
545 RemoveFilter(db_message_filter_.get()); 542 RemoveFilter(db_message_filter_.get());
546 db_message_filter_ = NULL; 543 db_message_filter_ = NULL;
547 544
548 // Shutdown the file thread if it's running. 545 // Shutdown the file thread if it's running.
549 if (file_thread_) 546 if (file_thread_)
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 hidden_widget_count_--; 1505 hidden_widget_count_--;
1509 1506
1510 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1507 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1511 return; 1508 return;
1512 } 1509 }
1513 1510
1514 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1511 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1515 } 1512 }
1516 1513
1517 } // namespace content 1514 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/media/rtc_peer_connection_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698