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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 | 431 |
432 // Shutdown the file thread if it's running. | 432 // Shutdown the file thread if it's running. |
433 if (file_thread_.get()) | 433 if (file_thread_.get()) |
434 file_thread_->Stop(); | 434 file_thread_->Stop(); |
435 | 435 |
436 if (compositor_output_surface_filter_.get()) { | 436 if (compositor_output_surface_filter_.get()) { |
437 RemoveFilter(compositor_output_surface_filter_.get()); | 437 RemoveFilter(compositor_output_surface_filter_.get()); |
438 compositor_output_surface_filter_ = NULL; | 438 compositor_output_surface_filter_ = NULL; |
439 } | 439 } |
440 | 440 |
| 441 compositor_thread_.reset(); |
441 if (input_handler_manager_.get()) { | 442 if (input_handler_manager_.get()) { |
442 RemoveFilter(input_handler_manager_->GetMessageFilter()); | 443 RemoveFilter(input_handler_manager_->GetMessageFilter()); |
443 input_handler_manager_.reset(); | 444 input_handler_manager_.reset(); |
444 } | 445 } |
445 | 446 |
446 if (webkit_platform_support_.get()) | 447 if (webkit_platform_support_.get()) |
447 WebKit::shutdown(); | 448 WebKit::shutdown(); |
448 | 449 |
449 lazy_tls.Pointer()->Set(NULL); | 450 lazy_tls.Pointer()->Set(NULL); |
450 | 451 |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1288 | 1289 |
1289 void RenderThreadImpl::SetFlingCurveParameters( | 1290 void RenderThreadImpl::SetFlingCurveParameters( |
1290 const std::vector<float>& new_touchpad, | 1291 const std::vector<float>& new_touchpad, |
1291 const std::vector<float>& new_touchscreen) { | 1292 const std::vector<float>& new_touchscreen) { |
1292 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1293 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1293 new_touchscreen); | 1294 new_touchscreen); |
1294 | 1295 |
1295 } | 1296 } |
1296 | 1297 |
1297 } // namespace content | 1298 } // namespace content |
OLD | NEW |