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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
84 #include "components/task_scheduler_util/renderer/initialization.h" | 84 #include "components/task_scheduler_util/renderer/initialization.h" |
85 #include "components/version_info/version_info.h" | 85 #include "components/version_info/version_info.h" |
86 #include "components/visitedlink/renderer/visitedlink_slave.h" | 86 #include "components/visitedlink/renderer/visitedlink_slave.h" |
87 #include "components/web_cache/renderer/web_cache_impl.h" | 87 #include "components/web_cache/renderer/web_cache_impl.h" |
88 #include "content/public/common/content_constants.h" | 88 #include "content/public/common/content_constants.h" |
89 #include "content/public/common/content_switches.h" | 89 #include "content/public/common/content_switches.h" |
90 #include "content/public/common/service_names.mojom.h" | 90 #include "content/public/common/service_names.mojom.h" |
91 #include "content/public/common/url_constants.h" | 91 #include "content/public/common/url_constants.h" |
92 #include "content/public/renderer/plugin_instance_throttler.h" | 92 #include "content/public/renderer/plugin_instance_throttler.h" |
93 #include "content/public/renderer/render_frame.h" | 93 #include "content/public/renderer/render_frame.h" |
94 #include "content/public/renderer/render_frame_visitor.h" | |
94 #include "content/public/renderer/render_thread.h" | 95 #include "content/public/renderer/render_thread.h" |
95 #include "content/public/renderer/render_view.h" | 96 #include "content/public/renderer/render_view.h" |
96 #include "content/public/renderer/render_view_visitor.h" | 97 #include "content/public/renderer/render_view_visitor.h" |
97 #include "extensions/common/constants.h" | 98 #include "extensions/common/constants.h" |
98 #include "extensions/features/features.h" | 99 #include "extensions/features/features.h" |
99 #include "ipc/ipc_sync_channel.h" | 100 #include "ipc/ipc_sync_channel.h" |
100 #include "media/media_features.h" | 101 #include "media/media_features.h" |
101 #include "net/base/net_errors.h" | 102 #include "net/base/net_errors.h" |
102 #include "ppapi/c/private/ppb_pdf.h" | 103 #include "ppapi/c/private/ppb_pdf.h" |
103 #include "ppapi/features/features.h" | 104 #include "ppapi/features/features.h" |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
243 names[existing_size + i] = WebString::fromUTF16(additional_names[i]); | 244 names[existing_size + i] = WebString::fromUTF16(additional_names[i]); |
244 values[existing_size + i] = WebString::fromUTF16(additional_values[i]); | 245 values[existing_size + i] = WebString::fromUTF16(additional_values[i]); |
245 } | 246 } |
246 | 247 |
247 existing_names->swap(names); | 248 existing_names->swap(names); |
248 existing_values->swap(values); | 249 existing_values->swap(values); |
249 } | 250 } |
250 #endif // BUILDFLAG(ENABLE_PLUGINS) | 251 #endif // BUILDFLAG(ENABLE_PLUGINS) |
251 | 252 |
252 #if BUILDFLAG(ENABLE_SPELLCHECK) | 253 #if BUILDFLAG(ENABLE_SPELLCHECK) |
253 class SpellCheckReplacer : public content::RenderViewVisitor { | 254 class SpellCheckReplacer : public content::RenderFrameVisitor { |
254 public: | 255 public: |
255 explicit SpellCheckReplacer(SpellCheck* spellcheck) | 256 explicit SpellCheckReplacer(SpellCheck* spellcheck) |
256 : spellcheck_(spellcheck) {} | 257 : spellcheck_(spellcheck) {} |
257 bool Visit(content::RenderView* render_view) override; | 258 bool Visit(content::RenderFrame* render_frame) override; |
258 | 259 |
259 private: | 260 private: |
260 SpellCheck* spellcheck_; // New shared spellcheck for all views. Weak Ptr. | 261 SpellCheck* spellcheck_; // New shared spellcheck for all views. Weak Ptr. |
261 DISALLOW_COPY_AND_ASSIGN(SpellCheckReplacer); | 262 DISALLOW_COPY_AND_ASSIGN(SpellCheckReplacer); |
262 }; | 263 }; |
263 | 264 |
264 bool SpellCheckReplacer::Visit(content::RenderView* render_view) { | 265 bool SpellCheckReplacer::Visit(content::RenderFrame* render_frame) { |
265 SpellCheckProvider* provider = SpellCheckProvider::Get(render_view); | 266 SpellCheckProvider* provider = SpellCheckProvider::Get(render_frame); |
266 DCHECK(provider); | 267 DCHECK(provider); |
267 provider->set_spellcheck(spellcheck_); | 268 provider->set_spellcheck(spellcheck_); |
268 return true; | 269 return true; |
269 } | 270 } |
270 #endif | 271 #endif |
271 | 272 |
272 #if BUILDFLAG(ENABLE_EXTENSIONS) | 273 #if BUILDFLAG(ENABLE_EXTENSIONS) |
273 bool IsStandaloneExtensionProcess() { | 274 bool IsStandaloneExtensionProcess() { |
274 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 275 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
275 extensions::switches::kExtensionProcess); | 276 extensions::switches::kExtensionProcess); |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
560 new subresource_filter::SubresourceFilterAgent( | 561 new subresource_filter::SubresourceFilterAgent( |
561 render_frame, subresource_filter_ruleset_dealer_.get()); | 562 render_frame, subresource_filter_ruleset_dealer_.get()); |
562 } | 563 } |
563 | 564 |
564 if (command_line->HasSwitch(switches::kInstantProcess) && | 565 if (command_line->HasSwitch(switches::kInstantProcess) && |
565 render_frame->IsMainFrame()) { | 566 render_frame->IsMainFrame()) { |
566 new SearchBox(render_frame); | 567 new SearchBox(render_frame); |
567 } | 568 } |
568 | 569 |
569 #if BUILDFLAG(ENABLE_SPELLCHECK) | 570 #if BUILDFLAG(ENABLE_SPELLCHECK) |
570 // TODO(xiaochengh): Use a different SpellCheckProvider for each RenderFrame. | 571 new SpellCheckProvider(render_frame, spellcheck_.get()); |
Xiaocheng
2017/04/07 01:43:45
SpellCheckProvider created at RenderFrameCreated()
| |
571 if (SpellCheckProvider* provider = | |
572 SpellCheckProvider::Get(render_frame->GetRenderView())) { | |
573 render_frame->GetWebFrame()->setTextCheckClient(provider); | |
574 } | |
575 #endif | 572 #endif |
576 } | 573 } |
577 | 574 |
578 void ChromeContentRendererClient::RenderViewCreated( | 575 void ChromeContentRendererClient::RenderViewCreated( |
579 content::RenderView* render_view) { | 576 content::RenderView* render_view) { |
580 #if BUILDFLAG(ENABLE_EXTENSIONS) | 577 #if BUILDFLAG(ENABLE_EXTENSIONS) |
581 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); | 578 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); |
582 #endif | 579 #endif |
583 #if BUILDFLAG(ENABLE_SPELLCHECK) | 580 #if BUILDFLAG(ENABLE_SPELLCHECK) |
584 SpellCheckProvider* provider = | |
585 new SpellCheckProvider(render_view, spellcheck_.get()); | |
586 // For a main frame of a view, RenderFrameCreated is called earlier than | |
587 // RenderViewCreated. This workaround ensures that WebTextCheckClient is | |
588 // still set for any main frame. | |
589 // TODO(xiaochengh): Remove this workaround once SpellCheckProvider becomes | |
590 // a RenderFrameObserver. | |
591 if (content::RenderFrame* main_frame = render_view->GetMainRenderFrame()) | |
592 main_frame->GetWebFrame()->setTextCheckClient(provider); | |
593 | |
594 new SpellCheckPanel(render_view); | 581 new SpellCheckPanel(render_view); |
595 #endif | 582 #endif |
596 new prerender::PrerendererClient(render_view); | 583 new prerender::PrerendererClient(render_view); |
597 | 584 |
598 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); | 585 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); |
599 | 586 |
600 new password_manager::CredentialManagerClient(render_view); | 587 new password_manager::CredentialManagerClient(render_view); |
601 } | 588 } |
602 | 589 |
603 | 590 |
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1228 return true; | 1215 return true; |
1229 } | 1216 } |
1230 | 1217 |
1231 #if BUILDFLAG(ENABLE_SPELLCHECK) | 1218 #if BUILDFLAG(ENABLE_SPELLCHECK) |
1232 void ChromeContentRendererClient::SetSpellcheck(SpellCheck* spellcheck) { | 1219 void ChromeContentRendererClient::SetSpellcheck(SpellCheck* spellcheck) { |
1233 RenderThread* thread = RenderThread::Get(); | 1220 RenderThread* thread = RenderThread::Get(); |
1234 if (spellcheck_.get() && thread) | 1221 if (spellcheck_.get() && thread) |
1235 thread->RemoveObserver(spellcheck_.get()); | 1222 thread->RemoveObserver(spellcheck_.get()); |
1236 spellcheck_.reset(spellcheck); | 1223 spellcheck_.reset(spellcheck); |
1237 SpellCheckReplacer replacer(spellcheck_.get()); | 1224 SpellCheckReplacer replacer(spellcheck_.get()); |
1238 content::RenderView::ForEach(&replacer); | 1225 content::RenderFrame::ForEach(&replacer); |
1239 if (thread) | 1226 if (thread) |
1240 thread->AddObserver(spellcheck_.get()); | 1227 thread->AddObserver(spellcheck_.get()); |
1241 } | 1228 } |
1242 #endif | 1229 #endif |
1243 | 1230 |
1244 bool ChromeContentRendererClient::IsExternalPepperPlugin( | 1231 bool ChromeContentRendererClient::IsExternalPepperPlugin( |
1245 const std::string& module_name) { | 1232 const std::string& module_name) { |
1246 // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. | 1233 // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. |
1247 // We must defer certain plugin events for NaCl instances since we switch | 1234 // We must defer certain plugin events for NaCl instances since we switch |
1248 // from the in-process to the out-of-process proxy after instantiating them. | 1235 // from the in-process to the out-of-process proxy after instantiating them. |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1536 | 1523 |
1537 RecordYouTubeRewriteUMA(result); | 1524 RecordYouTubeRewriteUMA(result); |
1538 return corrected_url.ReplaceComponents(r); | 1525 return corrected_url.ReplaceComponents(r); |
1539 } | 1526 } |
1540 | 1527 |
1541 std::unique_ptr<base::TaskScheduler::InitParams> | 1528 std::unique_ptr<base::TaskScheduler::InitParams> |
1542 ChromeContentRendererClient::GetTaskSchedulerInitParams() { | 1529 ChromeContentRendererClient::GetTaskSchedulerInitParams() { |
1543 return task_scheduler_util:: | 1530 return task_scheduler_util:: |
1544 GetRendererTaskSchedulerInitParamsFromCommandLine(); | 1531 GetRendererTaskSchedulerInitParamsFromCommandLine(); |
1545 } | 1532 } |
OLD | NEW |