OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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> |
11 | 11 |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/debug/trace_event.h" | 13 #include "base/debug/trace_event.h" |
14 #include "base/lazy_instance.h" | 14 #include "base/lazy_instance.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/metrics/field_trial.h" | 16 #include "base/metrics/field_trial.h" |
17 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
18 #include "base/metrics/stats_table.h" | 18 #include "base/metrics/stats_table.h" |
19 #include "base/shared_memory.h" | 19 #include "base/shared_memory.h" |
| 20 #include "base/string_number_conversions.h" // Temporary |
20 #include "base/task.h" | 21 #include "base/task.h" |
21 #include "base/threading/thread_local.h" | 22 #include "base/threading/thread_local.h" |
22 #include "base/values.h" | 23 #include "base/values.h" |
23 #include "base/win/scoped_com_initializer.h" | 24 #include "base/win/scoped_com_initializer.h" |
24 #include "content/common/appcache/appcache_dispatcher.h" | 25 #include "content/common/appcache/appcache_dispatcher.h" |
25 #include "content/common/child_process_messages.h" | 26 #include "content/common/child_process_messages.h" |
26 #include "content/common/database_messages.h" | 27 #include "content/common/database_messages.h" |
27 #include "content/common/db_message_filter.h" | 28 #include "content/common/db_message_filter.h" |
28 #include "content/common/dom_storage_messages.h" | 29 #include "content/common/dom_storage_messages.h" |
29 #include "content/common/gpu/gpu_messages.h" | 30 #include "content/common/gpu/gpu_messages.h" |
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
827 WebKit::resetPluginCache(reload_pages); | 828 WebKit::resetPluginCache(reload_pages); |
828 plugin_refresh_allowed_ = true; | 829 plugin_refresh_allowed_ = true; |
829 } | 830 } |
830 | 831 |
831 void RenderThreadImpl::OnNetworkStateChanged(bool online) { | 832 void RenderThreadImpl::OnNetworkStateChanged(bool online) { |
832 EnsureWebKitInitialized(); | 833 EnsureWebKitInitialized(); |
833 WebNetworkStateNotifier::setOnLine(online); | 834 WebNetworkStateNotifier::setOnLine(online); |
834 } | 835 } |
835 | 836 |
836 void RenderThreadImpl::OnTempCrashWithData(const GURL& data) { | 837 void RenderThreadImpl::OnTempCrashWithData(const GURL& data) { |
837 content::GetContentClient()->SetActiveURL(data); | 838 // Append next_page_id_ to the data from the browser. |
| 839 std::string temp = data.spec(); |
| 840 temp.append("#next"); |
| 841 temp.append(base::IntToString(RenderViewImpl::next_page_id())); |
| 842 |
| 843 content::GetContentClient()->SetActiveURL(GURL(temp)); |
838 CHECK(false); | 844 CHECK(false); |
839 } | 845 } |
840 | 846 |
841 scoped_refptr<base::MessageLoopProxy> | 847 scoped_refptr<base::MessageLoopProxy> |
842 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 848 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
843 DCHECK(message_loop() == MessageLoop::current()); | 849 DCHECK(message_loop() == MessageLoop::current()); |
844 if (!file_thread_.get()) { | 850 if (!file_thread_.get()) { |
845 file_thread_.reset(new base::Thread("Renderer::FILE")); | 851 file_thread_.reset(new base::Thread("Renderer::FILE")); |
846 file_thread_->Start(); | 852 file_thread_->Start(); |
847 } | 853 } |
848 return file_thread_->message_loop_proxy(); | 854 return file_thread_->message_loop_proxy(); |
849 } | 855 } |
OLD | NEW |