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 "chrome/renderer/render_thread.h" | 5 #include "chrome/renderer/render_thread.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <set> | |
jam
2011/03/29 18:31:59
nit: needed?
Lei Zhang
2011/03/30 22:05:43
I was following the linter, but it's a moot point
| |
10 #include <vector> | 11 #include <vector> |
11 | 12 |
12 #include "base/command_line.h" | 13 #include "base/command_line.h" |
13 #include "base/debug/trace_event.h" | 14 #include "base/debug/trace_event.h" |
14 #include "base/lazy_instance.h" | 15 #include "base/lazy_instance.h" |
15 #include "base/logging.h" | 16 #include "base/logging.h" |
16 #include "base/metrics/field_trial.h" | 17 #include "base/metrics/field_trial.h" |
17 #include "base/metrics/stats_table.h" | 18 #include "base/metrics/stats_table.h" |
18 #include "base/process_util.h" | 19 #include "base/process_util.h" |
19 #include "base/shared_memory.h" | 20 #include "base/shared_memory.h" |
(...skipping 17 matching lines...) Expand all Loading... | |
37 #include "chrome/renderer/extension_groups.h" | 38 #include "chrome/renderer/extension_groups.h" |
38 #include "chrome/renderer/extensions/chrome_app_bindings.h" | 39 #include "chrome/renderer/extensions/chrome_app_bindings.h" |
39 #include "chrome/renderer/extensions/event_bindings.h" | 40 #include "chrome/renderer/extensions/event_bindings.h" |
40 #include "chrome/renderer/extensions/extension_process_bindings.h" | 41 #include "chrome/renderer/extensions/extension_process_bindings.h" |
41 #include "chrome/renderer/extensions/js_only_v8_extensions.h" | 42 #include "chrome/renderer/extensions/js_only_v8_extensions.h" |
42 #include "chrome/renderer/extensions/renderer_extension_bindings.h" | 43 #include "chrome/renderer/extensions/renderer_extension_bindings.h" |
43 #include "chrome/renderer/external_extension.h" | 44 #include "chrome/renderer/external_extension.h" |
44 #include "chrome/renderer/loadtimes_extension_bindings.h" | 45 #include "chrome/renderer/loadtimes_extension_bindings.h" |
45 #include "chrome/renderer/net/renderer_net_predictor.h" | 46 #include "chrome/renderer/net/renderer_net_predictor.h" |
46 #include "chrome/renderer/render_process_impl.h" | 47 #include "chrome/renderer/render_process_impl.h" |
48 #include "chrome/renderer/render_view_wrapper.h" | |
jam
2011/03/29 18:31:59
I'm actually working on removing all the chrome de
Lei Zhang
2011/03/30 22:05:43
Ok. I did that in the next patchset.
| |
47 #include "chrome/renderer/renderer_histogram_snapshots.h" | 49 #include "chrome/renderer/renderer_histogram_snapshots.h" |
48 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" | 50 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" |
49 #include "chrome/renderer/search_extension.h" | 51 #include "chrome/renderer/search_extension.h" |
50 #include "chrome/renderer/searchbox_extension.h" | 52 #include "chrome/renderer/searchbox_extension.h" |
51 #include "chrome/renderer/security_filter_peer.h" | 53 #include "chrome/renderer/security_filter_peer.h" |
52 #include "chrome/renderer/spellchecker/spellcheck.h" | 54 #include "chrome/renderer/spellchecker/spellcheck.h" |
53 #include "chrome/renderer/user_script_slave.h" | 55 #include "chrome/renderer/user_script_slave.h" |
54 #include "content/common/appcache/appcache_dispatcher.h" | 56 #include "content/common/appcache/appcache_dispatcher.h" |
55 #include "content/common/database_messages.h" | 57 #include "content/common/database_messages.h" |
56 #include "content/common/db_message_filter.h" | 58 #include "content/common/db_message_filter.h" |
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
734 ++it, ++i) { | 736 ++it, ++i) { |
735 color_names[i] = it->first; | 737 color_names[i] = it->first; |
736 web_colors[i] = it->second; | 738 web_colors[i] = it->second; |
737 } | 739 } |
738 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 740 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
739 } | 741 } |
740 | 742 |
741 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 743 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { |
742 EnsureWebKitInitialized(); | 744 EnsureWebKitInitialized(); |
743 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 745 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
744 RenderView::Create( | 746 RenderView* rv = RenderView::Create( |
745 this, | 747 this, |
746 params.parent_window, | |
747 MSG_ROUTING_NONE, | |
748 params.renderer_preferences, | |
749 params.web_preferences, | 748 params.web_preferences, |
750 new SharedRenderViewCounter(0), | 749 new SharedRenderViewCounter(0), |
751 params.view_id, | 750 params.view_id, |
752 params.session_storage_namespace_id, | 751 params.session_storage_namespace_id); |
753 params.frame_name); | 752 // RenderViewWrapper implements the RenderViewObserver interface and shares |
753 // the lifetime of |rv|. | |
754 new RenderViewWrapper(rv, | |
755 params.parent_window, | |
756 MSG_ROUTING_NONE, | |
757 params.renderer_preferences, | |
758 params.frame_name); | |
754 } | 759 } |
755 | 760 |
756 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, | 761 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, |
757 size_t max_dead_capacity, | 762 size_t max_dead_capacity, |
758 size_t capacity) { | 763 size_t capacity) { |
759 EnsureWebKitInitialized(); | 764 EnsureWebKitInitialized(); |
760 WebCache::setCapacities( | 765 WebCache::setCapacities( |
761 min_dead_capacity, max_dead_capacity, capacity); | 766 min_dead_capacity, max_dead_capacity, capacity); |
762 } | 767 } |
763 | 768 |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1198 } | 1203 } |
1199 | 1204 |
1200 return false; | 1205 return false; |
1201 } | 1206 } |
1202 | 1207 |
1203 void RenderThread::RegisterExtension(v8::Extension* extension, | 1208 void RenderThread::RegisterExtension(v8::Extension* extension, |
1204 bool restrict_to_extensions) { | 1209 bool restrict_to_extensions) { |
1205 WebScriptController::registerExtension(extension); | 1210 WebScriptController::registerExtension(extension); |
1206 v8_extensions_[extension->name()] = restrict_to_extensions; | 1211 v8_extensions_[extension->name()] = restrict_to_extensions; |
1207 } | 1212 } |
OLD | NEW |