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 <vector> | 10 #include <vector> |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 compositor_output_surface_filter_ = NULL; | 443 compositor_output_surface_filter_ = NULL; |
444 } | 444 } |
445 | 445 |
446 compositor_thread_.reset(); | 446 compositor_thread_.reset(); |
447 input_handler_manager_.reset(); | 447 input_handler_manager_.reset(); |
448 if (input_event_filter_.get()) { | 448 if (input_event_filter_.get()) { |
449 RemoveFilter(input_event_filter_.get()); | 449 RemoveFilter(input_event_filter_.get()); |
450 input_event_filter_ = NULL; | 450 input_event_filter_ = NULL; |
451 } | 451 } |
452 | 452 |
| 453 // Ramp down IDB before we ramp down WebKit (and V8), since IDB classes might |
| 454 // hold pointers to V8 objects (e.g., via pending requests). |
| 455 main_thread_indexed_db_dispatcher_.reset(); |
| 456 |
453 if (webkit_platform_support_) | 457 if (webkit_platform_support_) |
454 WebKit::shutdown(); | 458 WebKit::shutdown(); |
455 | 459 |
456 lazy_tls.Pointer()->Set(NULL); | 460 lazy_tls.Pointer()->Set(NULL); |
457 | 461 |
458 // TODO(port) | 462 // TODO(port) |
459 #if defined(OS_WIN) | 463 #if defined(OS_WIN) |
460 // Clean up plugin channels before this thread goes away. | 464 // Clean up plugin channels before this thread goes away. |
461 NPChannelBase::CleanupChannels(); | 465 NPChannelBase::CleanupChannels(); |
462 #endif | 466 #endif |
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1341 if (!gamepad_shared_memory_reader_) | 1345 if (!gamepad_shared_memory_reader_) |
1342 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); | 1346 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); |
1343 gamepad_shared_memory_reader_->SampleGamepads(*data); | 1347 gamepad_shared_memory_reader_->SampleGamepads(*data); |
1344 } | 1348 } |
1345 | 1349 |
1346 base::ProcessId RenderThreadImpl::renderer_process_id() const { | 1350 base::ProcessId RenderThreadImpl::renderer_process_id() const { |
1347 return renderer_process_id_; | 1351 return renderer_process_id_; |
1348 } | 1352 } |
1349 | 1353 |
1350 } // namespace content | 1354 } // namespace content |
OLD | NEW |