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 "extensions/common/constants.h" | 97 #include "extensions/common/constants.h" |
98 #include "extensions/features/features.h" | 98 #include "extensions/features/features.h" |
99 #include "ipc/ipc_sync_channel.h" | 99 #include "ipc/ipc_sync_channel.h" |
100 #include "media/media_features.h" | 100 #include "media/media_features.h" |
101 #include "net/base/net_errors.h" | 101 #include "net/base/net_errors.h" |
102 #include "ppapi/c/private/ppb_pdf.h" | 102 #include "ppapi/c/private/ppb_pdf.h" |
103 #include "ppapi/features/features.h" | 103 #include "ppapi/features/features.h" |
104 #include "ppapi/shared_impl/ppapi_switches.h" | 104 #include "ppapi/shared_impl/ppapi_switches.h" |
105 #include "printing/features/features.h" | 105 #include "printing/features/features.h" |
106 #include "services/service_manager/public/cpp/connector.h" | 106 #include "services/service_manager/public/cpp/connector.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 names[existing_size + i] = WebString::FromUTF16(additional_names[i]); | 247 names[existing_size + i] = WebString::FromUTF16(additional_names[i]); |
248 values[existing_size + i] = WebString::FromUTF16(additional_values[i]); | 248 values[existing_size + i] = WebString::FromUTF16(additional_values[i]); |
249 } | 249 } |
250 | 250 |
251 existing_names->Swap(names); | 251 existing_names->Swap(names); |
252 existing_values->Swap(values); | 252 existing_values->Swap(values); |
253 } | 253 } |
254 #endif // BUILDFLAG(ENABLE_PLUGINS) | 254 #endif // BUILDFLAG(ENABLE_PLUGINS) |
255 | 255 |
256 #if BUILDFLAG(ENABLE_SPELLCHECK) | 256 #if BUILDFLAG(ENABLE_SPELLCHECK) |
257 class SpellCheckReplacer : public content::RenderViewVisitor { | 257 class SpellCheckReplacer : public content::RenderFrameVisitor { |
258 public: | 258 public: |
259 explicit SpellCheckReplacer(SpellCheck* spellcheck) | 259 explicit SpellCheckReplacer(SpellCheck* spellcheck) |
260 : spellcheck_(spellcheck) {} | 260 : spellcheck_(spellcheck) {} |
261 bool Visit(content::RenderView* render_view) override; | 261 ~SpellCheckReplacer() override; |
| 262 bool Visit(content::RenderFrame* render_frame) override; |
262 | 263 |
263 private: | 264 private: |
264 SpellCheck* spellcheck_; // New shared spellcheck for all views. Weak Ptr. | 265 // New shared spellcheck for all frames. Weak Ptr. |
| 266 SpellCheck* const spellcheck_; |
265 DISALLOW_COPY_AND_ASSIGN(SpellCheckReplacer); | 267 DISALLOW_COPY_AND_ASSIGN(SpellCheckReplacer); |
266 }; | 268 }; |
267 | 269 |
268 bool SpellCheckReplacer::Visit(content::RenderView* render_view) { | 270 bool SpellCheckReplacer::Visit(content::RenderFrame* render_frame) { |
269 SpellCheckProvider* provider = SpellCheckProvider::Get(render_view); | 271 SpellCheckProvider* provider = SpellCheckProvider::Get(render_frame); |
270 DCHECK(provider); | 272 DCHECK(provider); |
271 provider->set_spellcheck(spellcheck_); | 273 provider->set_spellcheck(spellcheck_); |
272 return true; | 274 return true; |
273 } | 275 } |
| 276 |
| 277 SpellCheckReplacer::~SpellCheckReplacer() = default; |
274 #endif | 278 #endif |
275 | 279 |
276 #if BUILDFLAG(ENABLE_EXTENSIONS) | 280 #if BUILDFLAG(ENABLE_EXTENSIONS) |
277 bool IsStandaloneExtensionProcess() { | 281 bool IsStandaloneExtensionProcess() { |
278 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 282 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
279 extensions::switches::kExtensionProcess); | 283 extensions::switches::kExtensionProcess); |
280 } | 284 } |
281 #endif | 285 #endif |
282 | 286 |
283 // Defers media player loading in background pages until they're visible. | 287 // Defers media player loading in background pages until they're visible. |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 new subresource_filter::SubresourceFilterAgent( | 572 new subresource_filter::SubresourceFilterAgent( |
569 render_frame, subresource_filter_ruleset_dealer_.get()); | 573 render_frame, subresource_filter_ruleset_dealer_.get()); |
570 } | 574 } |
571 | 575 |
572 if (command_line->HasSwitch(switches::kInstantProcess) && | 576 if (command_line->HasSwitch(switches::kInstantProcess) && |
573 render_frame->IsMainFrame()) { | 577 render_frame->IsMainFrame()) { |
574 new SearchBox(render_frame); | 578 new SearchBox(render_frame); |
575 } | 579 } |
576 | 580 |
577 #if BUILDFLAG(ENABLE_SPELLCHECK) | 581 #if BUILDFLAG(ENABLE_SPELLCHECK) |
578 // TODO(xiaochengh): Use a different SpellCheckProvider for each RenderFrame. | 582 new SpellCheckProvider(render_frame, spellcheck_.get()); |
579 if (SpellCheckProvider* provider = | |
580 SpellCheckProvider::Get(render_frame->GetRenderView())) { | |
581 render_frame->GetWebFrame()->SetTextCheckClient(provider); | |
582 } | |
583 #endif | 583 #endif |
584 } | 584 } |
585 | 585 |
586 void ChromeContentRendererClient::RenderViewCreated( | 586 void ChromeContentRendererClient::RenderViewCreated( |
587 content::RenderView* render_view) { | 587 content::RenderView* render_view) { |
588 #if BUILDFLAG(ENABLE_EXTENSIONS) | 588 #if BUILDFLAG(ENABLE_EXTENSIONS) |
589 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); | 589 ChromeExtensionsRendererClient::GetInstance()->RenderViewCreated(render_view); |
590 #endif | 590 #endif |
591 #if BUILDFLAG(ENABLE_SPELLCHECK) | 591 #if BUILDFLAG(ENABLE_SPELLCHECK) |
592 SpellCheckProvider* provider = | 592 // This is a workaround keeping the behavior that, the Blink side spellcheck |
593 new SpellCheckProvider(render_view, spellcheck_.get()); | 593 // enabled state is initialized on RenderView creation. |
594 // For a main frame of a view, RenderFrameCreated is called earlier than | 594 // TODO(xiaochengh): Design better way to sync between Chrome-side and |
595 // RenderViewCreated. This workaround ensures that WebTextCheckClient is | 595 // Blink-side spellcheck enabled states. See crbug.com/710097. |
596 // still set for any main frame. | 596 if (SpellCheckProvider* provider = |
597 // TODO(xiaochengh): Remove this workaround once SpellCheckProvider becomes | 597 SpellCheckProvider::Get(render_view->GetMainRenderFrame())) |
598 // a RenderFrameObserver. | 598 provider->EnableSpellcheck(spellcheck_->IsSpellcheckEnabled()); |
599 if (content::RenderFrame* main_frame = render_view->GetMainRenderFrame()) | |
600 main_frame->GetWebFrame()->SetTextCheckClient(provider); | |
601 | |
602 new SpellCheckPanel(render_view); | 599 new SpellCheckPanel(render_view); |
603 #endif | 600 #endif |
604 new prerender::PrerendererClient(render_view); | 601 new prerender::PrerendererClient(render_view); |
605 | 602 |
606 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); | 603 new ChromeRenderViewObserver(render_view, web_cache_impl_.get()); |
607 | 604 |
608 new password_manager::CredentialManagerClient(render_view); | 605 new password_manager::CredentialManagerClient(render_view); |
609 } | 606 } |
610 | 607 |
611 | 608 |
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1233 return true; | 1230 return true; |
1234 } | 1231 } |
1235 | 1232 |
1236 #if BUILDFLAG(ENABLE_SPELLCHECK) | 1233 #if BUILDFLAG(ENABLE_SPELLCHECK) |
1237 void ChromeContentRendererClient::SetSpellcheck(SpellCheck* spellcheck) { | 1234 void ChromeContentRendererClient::SetSpellcheck(SpellCheck* spellcheck) { |
1238 RenderThread* thread = RenderThread::Get(); | 1235 RenderThread* thread = RenderThread::Get(); |
1239 if (spellcheck_.get() && thread) | 1236 if (spellcheck_.get() && thread) |
1240 thread->RemoveObserver(spellcheck_.get()); | 1237 thread->RemoveObserver(spellcheck_.get()); |
1241 spellcheck_.reset(spellcheck); | 1238 spellcheck_.reset(spellcheck); |
1242 SpellCheckReplacer replacer(spellcheck_.get()); | 1239 SpellCheckReplacer replacer(spellcheck_.get()); |
1243 content::RenderView::ForEach(&replacer); | 1240 content::RenderFrame::ForEach(&replacer); |
1244 if (thread) | 1241 if (thread) |
1245 thread->AddObserver(spellcheck_.get()); | 1242 thread->AddObserver(spellcheck_.get()); |
1246 } | 1243 } |
1247 #endif | 1244 #endif |
1248 | 1245 |
1249 bool ChromeContentRendererClient::IsExternalPepperPlugin( | 1246 bool ChromeContentRendererClient::IsExternalPepperPlugin( |
1250 const std::string& module_name) { | 1247 const std::string& module_name) { |
1251 // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. | 1248 // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. |
1252 // We must defer certain plugin events for NaCl instances since we switch | 1249 // We must defer certain plugin events for NaCl instances since we switch |
1253 // from the in-process to the out-of-process proxy after instantiating them. | 1250 // from the in-process to the out-of-process proxy after instantiating them. |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1548 | 1545 |
1549 RecordYouTubeRewriteUMA(result); | 1546 RecordYouTubeRewriteUMA(result); |
1550 return corrected_url.ReplaceComponents(r); | 1547 return corrected_url.ReplaceComponents(r); |
1551 } | 1548 } |
1552 | 1549 |
1553 std::unique_ptr<base::TaskScheduler::InitParams> | 1550 std::unique_ptr<base::TaskScheduler::InitParams> |
1554 ChromeContentRendererClient::GetTaskSchedulerInitParams() { | 1551 ChromeContentRendererClient::GetTaskSchedulerInitParams() { |
1555 return task_scheduler_util:: | 1552 return task_scheduler_util:: |
1556 GetRendererTaskSchedulerInitParamsFromCommandLine(); | 1553 GetRendererTaskSchedulerInitParamsFromCommandLine(); |
1557 } | 1554 } |
OLD | NEW |